Fixing message search.

client/views/app/tabBar/messageSearch.coffee

 Template.messageSearch.helpers
 	tSearchMessages: ->
 		return t('Search_Messages')
-	
-	searchResult: ->
-		return Template.instance().searchResult.get()
+
+	searchResultMessages: ->
+		return Template.instance().searchResult.get()?.messages
 
 Template.messageSearch.events
 	"keydown #message-search": (e) ->
@@ -11,16 +11,20 @@ Template.messageSearch.events
 			e.preventDefault()
 
 	"keyup #message-search": _.debounce (e, t) ->
-		t.searchResult.set undefined
 		value = e.target.value.trim()
-		if value is ''
+		if value is '' and t.currentSearchTerm
+			t.searchResult.set undefined
+			return
+		else if value is t.currentSearchTerm
 			return
 
 		Tracker.nonreactive ->
 			Meteor.call 'messageSearch', value, Session.get('openedRoom'), (error, result) ->
 				if result? and (result.messages?.length > 0 or result.users?.length > 0 or result.channels?.length > 0)
 					t.searchResult.set result
-	, 1000
+					t.currentSearchTerm = value
+	, 500
 
 Template.messageSearch.onCreated ->
+	this.currentSearchTerm = ''
 	this.searchResult = new ReactiveVar

client/views/app/tabBar/messageSearch.html

@@ -8,12 +8,10 @@
 				</div>
 			</form>
 		</div>
-		{{#if searchResult.messages}}
 		<ul>
-			{{#each searchResult.messages}}
+			{{#each searchResultMessages}}
 				{{#nrr nrrargs 'message' .}}{{/nrr}}
 			{{/each}}
 		</ul>
-		{{/if}}
 	</div>
 </template>