         message.bcc = []
         message.subject = ''
         message.text = ''
+        message.html = "#{COMPOSE_STYLE}\n<p><br></p>"
+
         if isSignature
-            message.text += "-- \n#{signature}"
-        message.html = COMPOSE_STYLE
-        if isSignature
-            signature = signature.replace /\n/g, '<br>'
-            message.html += """
-            <p><br></p><p><br></p>
-            <p id="signature">-- \n<br>#{signature}</p>
-            """
+            @addSignature message, signature
 
         return message
 

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


    # Build message to display in composer in case of a reply to all message:
    # * set subject automatically (Re: previous subject)

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

        if isSignature
            @addSignature message, signature

        message.html += """

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