diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp
index a1a2f29..0e41495 100644
--- a/golded3/gccfgg.cpp
+++ b/golded3/gccfgg.cpp
@@ -678,9 +678,7 @@ CfgGed::CfgGed() {
   beepfactor = 1000;
   beepyourmail = true;
   carboncopylist = CC_NAMES;
-  cfgdispmargin = NO;
   cfgeditquotemargin = 75;
-  cfgquotemargin = 70;
   confirmresponse = ASK;
   crosspost = ASK;
   crosspostlist = CC_NAMES;
@@ -692,7 +690,7 @@ CfgGed::CfgGed() {
   dispareano = true;
   dispattachsize = ATTACH_KBYTES;
   displistcursor = NO;
-  dispmargin = NO;
+  dispmargin = 0;
   dispmsgsize = DISPMSGSIZE_BYTES;
   disptabsize = 8;
   encodeemailheaders = true;
diff --git a/golded3/gccfgg3.cpp b/golded3/gccfgg3.cpp
index 86be0f0..762f255 100644
--- a/golded3/gccfgg3.cpp
+++ b/golded3/gccfgg3.cpp
@@ -36,8 +36,7 @@ extern char* val;
 
 void CfgDispmargin() {
 
-  CFG->cfgdispmargin = atoi(val);
-  CFG->dispmargin = CFG->cfgdispmargin;
+  CFG->dispmargin = atoi(val);
 }
 
 //  ------------------------------------------------------------------
diff --git a/golded3/gccfgg6.cpp b/golded3/gccfgg6.cpp
index bce3ac2..980b25d 100644
--- a/golded3/gccfgg6.cpp
+++ b/golded3/gccfgg6.cpp
@@ -384,8 +384,7 @@ void CfgQuotectrl() {
 
 void CfgQuotemargin() {
 
-  CFG->cfgquotemargin = atoi(val);
-  CFG->quotemargin = CFG->cfgquotemargin;
+  CFG->quotemargin = atoi(val);
 }
 
 //  ------------------------------------------------------------------
diff --git a/golded3/gecfgg.h b/golded3/gecfgg.h
index 6e900bb..4be7348 100644
--- a/golded3/gecfgg.h
+++ b/golded3/gecfgg.h
@@ -128,9 +128,7 @@ public:
 
   Grp         grp;
 
-  int         cfgdispmargin;
   int         cfgeditquotemargin;
-  int         cfgquotemargin;
 
   std::list<CmdKey> cmdkey;
   std::vector<Macro> macro;
diff --git a/golded3/geedit.cpp b/golded3/geedit.cpp
index 5ab0b17..3290940 100644
--- a/golded3/geedit.cpp
+++ b/golded3/geedit.cpp
@@ -2207,7 +2207,7 @@ int IEclass::Start(int __mode, uint* __position, GMsg* __msg) {
   else
     margintext = CFG->dispmargin;
 
-  marginquotes = EDIT->QuoteMargin();
+  marginquotes = EDIT->QuoteMargin() + 1; // Add one for CR
   if(marginquotes > margintext)
     marginquotes = margintext;
 
diff --git a/golded3/geinit.cpp b/golded3/geinit.cpp
index 1545743..ed63977 100644
--- a/golded3/geinit.cpp
+++ b/golded3/geinit.cpp
@@ -765,14 +765,12 @@ void Initialize(int argc, char* argv[]) {
   if(CFG->screenmaxcol >= 80)
     MAXCOL = CFG->screenmaxcol;
 
-  CFG->dispmargin = CFG->cfgdispmargin;
   if(CFG->dispmargin <= 0)
     CFG->dispmargin += MAXCOL;
 
   if(CFG->dispmargin > MAXCOL)
     CFG->dispmargin = MAXCOL;
 
-  CFG->quotemargin = CFG->cfgquotemargin;
   if(CFG->quotemargin <= 0)
     CFG->quotemargin += MAXCOL;
 
diff --git a/golded3/gemsgs.cpp b/golded3/gemsgs.cpp
index 6e2677c..da60169 100644
--- a/golded3/gemsgs.cpp
+++ b/golded3/gemsgs.cpp
@@ -513,7 +513,7 @@ void LoadText(GMsg* msg, const char* textfile) {
             if(*txtptr == LF)
               *txtptr = CR;
           }
-          else if((buf[0] == buf[1]) and (buf[0] == buf[2])) {
+          else if(not isspace(buf[0]) and (buf[0] == buf[1]) and (buf[0] == buf[2])) {
             if(not isspace(buf[read_len-1])) read_len += 1;
             buf[read_len-1] = CR;
             buf[read_len] = NUL;