         else
             return from
 
+    # Add signature at the end of the message
+    addSignature: (message, signature) ->
+        message.text += "\n\n-- \n#{signature}"
+        signatureHtml = signature.replace /\n/g, '<br>'
+        message.html += """
+        <p><br></p><p id="signature">-- \n<br>#{signatureHtml}</p>
+            """
 
     # Build message to put in the email composer depending on the context
     # (reply, reply to all, forward or simple message).

        message.bcc = []
        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.bcc = []
        message.subject = ''
        message.text = ''
        message.html = "#{COMPOSE_STYLE}\n<p><br></p>"

        if isSignature
            @addSignature message, signature

        return message

