+--- roundcubemail/program/steps/mail/sendmail.inc (revision 1232)\r
++++ roundcubemail/program/steps/mail/sendmail.inc (revision 1261)\r
+@@ -211,7 +211,4 @@\r
+ \r
+ // additional headers\r
+-$headers['Message-ID'] = $message_id;\r
+-$headers['X-Sender'] = $from;\r
+-\r
+ if ($CONFIG['http_received_header'])\r
+ {\r
+@@ -224,4 +221,7 @@\r
+ }\r
+ \r
++$headers['Message-ID'] = $message_id;\r
++$headers['X-Sender'] = $from;\r
++\r
+ if (!empty($CONFIG['useragent']))\r
+ $headers['User-Agent'] = $CONFIG['useragent'];\r