@@ -1,6 +1,7 @@

 .conversation.clear.border

   .history-settings

-    %a.left.load-history{href: '#'} #{I18n.t('chat.history.load')}

+    -unless @hideHistoryLoading

+      %a.left.load-history{href: '#'} #{I18n.t('chat.history.load')}

     %input.hidden{ type: 'checkbox', name: 'enable-history', value: '1', id: 'ihistory', checked: 'checked'}

     %label.right.action.enabled{ for: 'ihistory' } #{I18n.t('chat.history.disable')}

@@ -10,5 +11,4 @@

   .messages#height-setter-2

     -for view in @history

       #{view}

-  -if @showWriter

-    != JST['backbone/templates/chat/message_writer']()

\ No newline at end of file

+  != JST['backbone/templates/chat/message_writer']()

\ No newline at end of file

@@ -33,7 +33,7 @@ class Xmpp.Views.Chat.WindowView extends Backbone.View

     historyStackHtml = _.map(@historyStack, (view) ->

       view.render().el.outerHTML

     )

-    $(@el).html(@template(showWriter: true, history: historyStackHtml))

+    $(@el).html(@template(hideHistoryLoading: @tab.getChatId() != null, history: historyStackHtml))

     @_changeHistoryVisibly(@savingHistory)

     @show()