             message.references = message.references.concat message.inReplyTo
 
         switch action
+
             when ComposeActions.REPLY
-                separator = t('compose reply separator',
-                    {date: dateHuman, sender: sender})
+                params = date: dateHuman, sender: sender
+                separator = t 'compose reply separator', params
                 message.to = @getReplyToAddress inReplyTo
                 message.cc = []
                 message.bcc = []

                    <blockquote>#{html}</blockquote>
                    <p><br /></p>
                    """
            when ComposeActions.FORWARD
                separator = t('compose forward separator',
                    {date: dateHuman, sender: sender})

                    <blockquote>#{html}</blockquote>
                    <p><br /></p>
                    """

            when ComposeActions.REPLY_ALL
                params = date: dateHuman, sender: sender
                separator = t 'compose reply separator', params
                message.to = @getReplyToAddress inReplyTo

                # filter to don't have same address twice
                toAddresses = message.to.map (dest) -> return dest.address
                message.cc = [].concat(inReplyTo.get('from'),
