diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index 74e3ce974..5fd3c047d 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -1853,9 +1853,9 @@ public class MimeUtility {
                 }
                 text.append(FILENAME_PREFIX);
                 text.append(filename);
+                text.append(FILENAME_SUFFIX);
                 text.append(TEXT_DIVIDER.substring(0, TEXT_DIVIDER_LENGTH -
                         FILENAME_PREFIX_LENGTH - filename.length() - FILENAME_SUFFIX_LENGTH));
-                text.append(' ');
             } else {
                 text.append(TEXT_DIVIDER);
             }