--- a/roundup/roundupdb.py	Sun Feb 08 00:35:41 2015 +1100
+++ b/roundup/roundupdb.py	Tue Mar 10 21:39:52 2015 +0100
@@ -623,10 +623,12 @@
             else:
                 send_msg = message
             mailer.set_message_attributes(send_msg, sendto, subject, author)
-            send_msg ['Message-Id'] = message ['Message-Id']
-            send_msg ['Reply-To'] = message ['Reply-To']
-            if message.get ('In-Reply-To'):
-                send_msg ['In-Reply-To'] = message ['In-Reply-To']
+            if crypt:
+                send_msg ['Message-Id'] = message ['Message-Id']
+                send_msg ['Reply-To'] = message ['Reply-To']
+                if message.get ('In-Reply-To'):
+                    send_msg ['In-Reply-To'] = message ['In-Reply-To']
+
             mailer.smtp_send(sendto, send_msg.as_string())
             if first:
                 if crypt: