diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index e1557d268..78a46f355 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -864,7 +864,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					this.prepareMessageAttachments(oLastMessage, options.mode);
 					this.aDraftInfo = ['reply', oLastMessage.uid, oLastMessage.folder];
 					this.sInReplyTo = oLastMessage.messageId;
-					this.sReferences = (oLastMessage.messageId + ' ' + oLastMessage.references).trim();
+					this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
 					// OpenPGP “Transferable Public Key”
 //					oLastMessage.autocrypt?.keydata
 					break;
@@ -875,7 +875,7 @@ export class ComposePopupView extends AbstractViewPopup {
 					this.prepareMessageAttachments(oLastMessage, options.mode);
 					this.aDraftInfo = ['forward', oLastMessage.uid, oLastMessage.folder];
 					this.sInReplyTo = oLastMessage.messageId;
-					this.sReferences = (oLastMessage.messageId + ' ' + oLastMessage.references).trim();
+					this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
 					break;
 
 				case ComposeType.Draft:
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
index 985e71905..65f890dbc 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
@@ -156,8 +156,9 @@ class Header
 			}
 		}
 
-		// https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1
-		return \wordwrap($this->NameWithDelimitrom() . $sResult, 78, "\r\n ");
+		// https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1, avoid folding immediately after the header name
+                return $this->NameWithDelimitrom() . \wordwrap($sResult, 78 - \strlen($this->NameWithDelimitrom()) - 1, "\r\n ");
+
 	}
 
 	public function IsSubject() : bool