         if (editor = @refs.editor.getDOMNode())
             editor.removeEventListener 'click', @saveFocus
 
-    closeSaveDraft: (state, options={}) ->
-        fetch = (error, message) =>
-            return if error or not message
-
-            unless options.silent
-                msg = "#{t "message action draft ok"}"
-                LayoutActionCreator.notify msg, autoclose: true
-
+    closeSaveDraft: ->
+        fetch = (message) =>
             # reload conversation to update its length
-            cid = message.conversationID
-            MessageActionCreator.fetchConversation cid
+            if (cid = message.conversationID)
+                MessageActionCreator.fetchConversation cid
 
         save = =>
-            MessageActionCreator.send _.clone(state), (error, message) ->
+            MessageActionCreator.send _.clone(@state), (error, message) ->
                 if error? or not message?
                     msg = "#{t "message action draft ko"} #{error}"
                     LayoutActionCreator.alertError msg
                     return
 
-                fetch error, message
+                fetch message
 
         # Fetch
-        unless options.hasChanged
+        unless @hasChanged()
+            fetch @state
             return
 
         # Do not ask for save
-        if options.silent
-            save()
-            return
-
-        # Ask for changes
-        init = =>
-            @showModal
-                title       : t 'app confirm delete'
-                subtitle    : t 'compose confirm keep draft'
-                closeLabel  : t 'compose confirm draft keep'
-                actionLabel : t 'compose confirm draft delete'
-                closeModal  : ->
-                    LayoutActionCreator.hideModal()
-                    save()
-        setTimeout init, 0
+        save()
+        return
 
     render: ->
         closeUrl = @buildClosePanelUrl @props.layout

        # Focus Element
        @handleFocus()

        # Each state:change do not send data to server
        # update date for client modifications
        unless @props.lastUpdate
            @props.lastUpdate = @state.date
        else
            @state.date = new Date().toISOString()

    hasChanged: (props, state) ->
        (props.lastUpdate and props.lastUpdate isnt state.date) or false

    resetChange: ->
        delete @props.lastUpdate

    componentWillUnmount: ->
        MessageStore.removeListener 'change', @_setStateFromStores

        @removeFocusListener()

        # Save Message into Draft
        @closeSaveDraft()

    handleFocus: ->
        return unless (path = LayoutStore.getFocus())
