             <p><br></p>
             """
         if isSignature
-            signature = signature.replace /\n/g, '<br>'
-            message.html += """
-            <p><br></p><p id="signature">-- \n<br>#{signature}</p>
-            """
-
+            @addSignature message, signature
 
     # Build message to display in composer in case of a reply to all message:
     # * set subject automatically (Re: previous subject)


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

            """
        message.text = textSeparator + text
        message.html = "#{COMPOSE_STYLE}"

        if isSignature
            @addSignature message, signature

        message.html += """

<p>#{htmlSeparator}</p><p><br></p>#{html}
