diff --git a/remail/mail.py b/remail/mail.py
index 02c278f..1dd6860 100644
--- a/remail/mail.py
+++ b/remail/mail.py
@@ -230,6 +230,7 @@ def msg_set_gpg_payload(msg, encpl, bseed, addpgp=False):
     content += encpl + '\n'
     if addpgp:
         content += '-----END PGP MESSAGE-----\n\n'
+    content += '--%s--\n' % boundary
 
     msg_set_payload(msg, msg_from_string(content))
     msg_set_header(msg, 'Mime-Version', '1')
@@ -269,7 +270,7 @@ def msg_strip_html(msg):
             content += '--%s\n' % boundary
             content += m.as_string()
             content += '\n'
-        content += '--%s\n' % boundary
+        content += '--%s--\n' % boundary
         msg_set_payload(msg, msg_from_string(content))
 
 def msg_sanitize_outlook(msg):