From 6a2589635bdbe0cb1cf0ef6f60afeab4deac6c32 Mon Sep 17 00:00:00 2001
From: "rhp%netscape.com" <rhp%netscape.com>
Date: Wed, 5 Jan 2000 15:08:32 +0000
Subject: [PATCH] Fix for incorrect signature HTML - Bug #23011 - r: jefft

---
 mailnews/compose/src/nsMsgCompose.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp
index 1f4df31d01f..cc91646a804 100644
--- a/mailnews/compose/src/nsMsgCompose.cpp
+++ b/mailnews/compose/src/nsMsgCompose.cpp
@@ -1789,19 +1789,23 @@ nsMsgCompose::ProcessSignature(nsIMsgIdentity *identity, nsString *aMsgBody)
     {
       aMsgBody->Append(htmlBreak);
       if (!htmlSig)
+      {
         aMsgBody->Append("<pre>");
+        aMsgBody->Append(CRLF);
+      }
     }
     else
       aMsgBody->Append(CRLF);
     
     aMsgBody->Append(dashes);
 
-    if (m_composeHTML)
-      aMsgBody->Append(htmlBreak);
-    else
+    if ( (!m_composeHTML) || ((m_composeHTML) && (!htmlSig)) )
       aMsgBody->Append(CRLF);
+    else if (m_composeHTML)
+      aMsgBody->Append(htmlBreak);
     
     aMsgBody->Append(sigData);
+
     if ( (m_composeHTML) && (!htmlSig) )
       aMsgBody->Append("</pre>");
   }