             <p><br /></p>
             """
         if signature
+            signature = signature.replace /\n/g, '<br>'
             message.html += """
-            <p><br /></p><pre id="signature">--\n#{signature}</pre>
+            <p><br /></p><p id="signature">#{signature}</p>
             """
 
 

            <p><br /></p>
            """
        if signature
            message.html += """
            <p><br /></p><pre id="signature">--\n#{signature}</pre>
            """



        message.subject = @getReplySubject inReplyTo
        message.text = separator + @generateReplyText(text) + "\n"
        if signature
            message.text += "\n\n#{signature}"
        message.html = """
            #{COMPOSE_STYLE}
            <p>#{separator}<span class="originalToggle"> … </span></p>
