 
   isSystemMessage: (message) ->
     return  unless message
-    splitted     = message.split " "
+    splitted     = message.trim().split " "
     keyword      = splitted.first
     hasMaxLength = splitted.length is 2
     hasHandler   = replyHandlers[keyword] isnt undefined
     isHelp       = keyword is "help"
-
-    return if isHelp then splitted.length is 1 else hasMaxLength and hasHandler
+    isStopWatch  = keyword is "stop"
+
+    if isHelp
+      return splitted.length is 1
+    else if isStopWatch
+      return message is "stop watching"
+    else
+      return hasMaxLength and hasHandler
 
   runSystemMessageHandler: (message) ->
     splitted = message.split " "

    @workspace.setWatchMode username
    @botReply getMessage "watchReply", username

  botReply: (message) ->
    messageData =
      message   : message

    invite        : "replyForInvite"
    watch         : "replyForWatch"
    join          : "replyForJoin"
    stop          : "replyForStopWatching"

  messages        =
    welcome       : """
