Index: mailnews/compose/src/nsMsgCompose.cpp =================================================================== RCS file: /cvsroot/mozilla/mailnews/compose/src/nsMsgCompose.cpp,v retrieving revision 1.531 diff -u -r1.531 nsMsgCompose.cpp --- mailnews/compose/src/nsMsgCompose.cpp 4 Oct 2007 18:13:01 -0000 1.531 +++ mailnews/compose/src/nsMsgCompose.cpp 17 Oct 2007 13:45:18 -0000 @@ -653,10 +653,21 @@ (void)TagEmbeddedObjects(mailEditor); if (!aSignature.IsEmpty()) + { + if (sigOnTop) + m_editor->BeginningOfDocument(); htmlEditor->InsertHTML(aSignature); + + m_editor->EndOfDocument(); + } } else if (textEditor) { + if (sigOnTop && !aSignature.IsEmpty()) { + textEditor->InsertText(aSignature); + m_editor->EndOfDocument(); + } + if (!aBuf.IsEmpty()) { if (mailEditor) @@ -666,7 +677,7 @@ m_editor->EndOfDocument(); } - if (!aSignature.IsEmpty()) + if (!sigOnTop && !aSignature.IsEmpty()) textEditor->InsertText(aSignature); } }