piem--write-mbox-to-maildir finds the bounds for each message by doing a plain search for "From mboxrd@z", but of course nothing prevents that from being within the text of the message. Anchor it to the start of the line to prevent false positives. --- This embarrassing gem was found when trying to inject <dde16a7a7a212e0947fdf3afad5678bac7ad2690.1610964014.git.public@yoctocell.xyz>. piem.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/piem.el b/piem.el index 8c23e7b..867a7e5 100644 --- a/piem.el +++ b/piem.el @@ -489,9 +489,9 @@ (defun piem--write-mbox-to-maildir () (let ((n-added 0) (n-skipped 0)) (while (and (not (eobp)) - (search-forward "From mboxrd@z" nil t)) + (re-search-forward "^From mboxrd@z" nil t)) (let* ((beg (line-beginning-position 2)) - (end (or (and (search-forward "From mboxrd@z" nil t) + (end (or (and (re-search-forward "^From mboxrd@z" nil t) (progn (goto-char (line-beginning-position 0)) (point-marker))) (point-max-marker))) base-commit: 9abfc09d24e73044f2392f45fc41169ee4afd72f -- 2.29.2