         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
 

        else
            return from


    # Build message to put in the email composer depending on the context
    # (reply, reply to all, forward or simple message).

            <p><br></p>
            """
        if isSignature
            @addSignature message, signature


    # Build message to display in composer in case of a message forwarding:
