@@ -21,11 +21,11 @@ class Xmpp.Views.Chat.MessageView extends Backbone.View

   formatTime:  ->

     nowDate = new Date()

-    if (nowDate.getDate() != @dateSent.getDate() &&

-        nowDate.getMonth() != @dateSent.getMonth() &&

+    if (nowDate.getDate() != @dateSent.getDate() ||

+        nowDate.getMonth() != @dateSent.getMonth() ||

         nowDate.getFullYear() != @dateSent.getFullYear())

       return @dateSent.getFullYear() + '/' + @_padDate((@dateSent.getMonth()+1)) + '/' + @_padDate(@dateSent.getDate()) +

-        ' @ ' + @_padDate(@dateSent.getHours()) + ':' + @_padDate(@dateSent.getMinutes())

+        ' ' + @_padDate(@dateSent.getHours()) + ':' + @_padDate(@dateSent.getMinutes())

     return @_padDate(@dateSent.getHours()) + ':' + @_padDate(@dateSent.getMinutes())