diff --git a/docs/notework.txt b/docs/notework.txt
index 757124a..995feac 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -12,6 +12,9 @@ ______________________________________________________________________
                  Notes for GoldED+ 1.1.5, March xx 2001
 ______________________________________________________________________
 
+- Fixed double recoding of header during forward, quote-reply, and
+  change.
+
 + Added new keyword WRITETEMPLATE which defines template to be used on
   saving messages. Could be used in Random System Groups or globally.
 
diff --git a/golded3/gepost.cpp b/golded3/gepost.cpp
index 2710bd6..2f52244 100644
--- a/golded3/gepost.cpp
+++ b/golded3/gepost.cpp
@@ -762,7 +762,7 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
         msg->inreplyto = NULL;
         msg->references = NULL;
         msg->attr.tou0();
-        msg->TextToLines(CFG->dispmargin-1);
+        msg->TextToLines(CFG->dispmargin-1, false);
         *msg->iorig = NUL;
         *msg->idest = NUL;
         *msg->ireplyto = NUL;
@@ -788,7 +788,7 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
         msg->inreplyto = NULL;
         msg->references = NULL;
         msg->attr.tou0();
-        msg->TextToLines(CFG->dispmargin-1);
+        msg->TextToLines(CFG->dispmargin-1, false);
         break;
       case MODE_NEW:
         wfill(MINROW, 0, MAXROW-2, MAXCOL-1, ' ', C_READW);
@@ -830,7 +830,7 @@ void MakeMsg(int mode, GMsg* omsg, bool ignore_replyto) {
         case MODE_QUOTE:
         case MODE_REPLYCOMMENT:
           omsg->attr.tou0();
-          omsg->TextToLines(-CFG->quotemargin);
+          omsg->TextToLines(-CFG->quotemargin, false);
           if(ignore_replyto)
             *omsg->ireplyto = NUL;
           if(omsg->attr.rot())
diff --git a/golded3/getpls.cpp b/golded3/getpls.cpp
index 281fd52..b263bf5 100644
--- a/golded3/getpls.cpp
+++ b/golded3/getpls.cpp
@@ -210,11 +210,11 @@ int TemplateToText(int mode, GMsg* msg, GMsg* oldmsg, const char* tpl, int origa
       fputs("@header= @oecho (@caddr) @align{79}{=}\n", fp);
       fputs("@header Msg  : @msgno of @msgs@align{44}@attr\n", fp);
       if(AA->isinternet()) {
-        fputs("@header From : @ofrom@align{64}@odtime\n", fp);
+        fputs("@header From : @ofrom@align{60}@odtime\n", fp);
         fputs("@header From : @oto\n", fp);
       }
       else {
-        fputs("@header From : @oname@align{44}@oaddr@align{64}@odtime\n", fp);
+        fputs("@header From : @oname@align{44}@oaddr@align{60}@odtime\n", fp);
         fputs("@header To   : @dname\n", fp);
       }
       fputs("@header Subj : @subject\n", fp);