         
         SM.incident.resolve(id, solution, ins,resp.message.user.email_address)
           .then (r)->
-             resp.reply "Cheers! The solution was updated and incident #{id} was resolved successfully!"
-          .catch (r) ->
-            robot.logger.debug r
-            msg = robot.sm_ext.buildSlackMsgFromSmError "Failed to update incident #{id}", resp.message.rawMessage.channel, r
-            robot.emit 'slack.attachment', msg
-
-        resp.reply "Good job! Let me update the solution for incident #{id}."
+             resp.reply "Incident #{id} was resolved."
+          .catch (r) ->
+            robot.logger.debug r
+            msg = robot.sm_ext.buildSlackMsgFromSmError "Failed to resolve the incident #{id}", resp.message.rawMessage.channel, r
+            robot.emit 'slack.attachment', msg
+
+        resp.reply "Resolving incident #{id}..."
       addactivity: (fullCmdLine, resp)->
         room = resp.message.room
         match = /sm\s+addactivity\s+incident\s+([\w\d]+)\s+\"([^\n]*)\"(?:\s+on\s+([\w\d]+))?/i.exec fullCmdLine
         if not match
-          sendHelp room, ["Please use `sm addactivity incident [ID] \"[activity]\"` to add activity for an instance of Service Manager Incident", "For other commands, please check `sm`"]
+          sendHelp room, ["Please use the correct syntax: 'sm addactivity incident [ID] \"[activity]\"'.","To learn more about all supported commands, enter 'sm'."]
           return
         id = match[1]
         activity = match[2]

    result += "----------------------\r\n"
    return result
  helpAttach = [
    "Please use `sm attach-conversation incident [ID]` to attach channel converstaion to Service Manager Incident"
  ]
  helpSm = [
    "Hi, use `sm` to access Service Manager. Try following command to continue...",
    "* `sm incident` - to access Service Manager Incident Management module"
  ]

  helpIncident = [
    "Hi, you can do a lots on Service Manager Incident Management module",
    "* `sm get incident [ID] (on [sm instance])` - Get a Service Manager incident by ID", 
    "* `sm assign incident [ID] [person] (on [sm instance])` - Assign or reassign an incident to somebody (by email, SM username or Slack username)",   
    "* `sm resolve incident [ID] \"[solution]\" (on [sm instance])` - Resolve an incident by providing a solution", 
    "* `sm addactivity incident [ID] \"[activity]\" (on [sm instance])` - Add an activity to an incident", 
    "* `sm create incident \"[description]\" -channel (on [sm instance])` - Create an incident and an optional channel (omit '-channel' to not create a channel)",
    "* `sm update incident [ID] [field1=value2] [field2=value2] (on [sm instance])` - Update a Service Manager incident",
    "* `sm attach-conversation incident [ID] (on [sm instance])` - Attach conversation in this channel to Service Manager incident"
  ]

  sendHelp = (channel, msg)->

        # check instance
        data = Config.get "sm.servers.#{ins}"
        if not data
          sendHelp room, ["Please specify a validate Service Manager Instance name", "To learn more about all supported commands, enter 'sm'."]
          return
        if not params
          sendHelp room, ["Can not update with nothing", "Please specify what you want to update in `field`=`value` formats", "To learn more about all supported commands, enter 'sm'."]
          return


