@@ -12,9 +12,14 @@ this.App =

   UI:

     setAutoHeight: ->

-      height = $(window).height()

-      $("#height-setter-1").css({height: height - 50})

-      $("#height-setter-2").css({height: height - $('#tabbar').outerHeight() - $('#msg-writer').outerHeight() - 57})

+      windowHeight = $(window).height()

+      if (windowHeight < $('.roster').css('min-height').replace(/[^-\d\.]/g, ''))

+        return

+

+      toolboxHeight = $("#height-setter-1 .toolbox").height()

+      $("#height-setter-1").css({height: windowHeight - toolboxHeight - 70})

+      $("#height-setter-1 .friends").css({height: windowHeight - toolboxHeight - 100})

+      $("#height-setter-2").css({height: windowHeight - $('#tabbar').outerHeight() - $('#msg-writer').outerHeight() - 57})

     filterContacts: (searchTerm) ->

       App.Collections.contacts.filter(searchTerm)

@@ -241,6 +246,7 @@ this.App =

           )

           tab.chatWindow.appendMessage(contact, new Date(), result.message)

+          tab.chatWindow.log(message)

       )

   Models:

@@ -39,6 +39,11 @@

   &:hover, &:active {

     cursor: default;

   }

+

+  .wrap {

+    overflow-y: auto;

+    overflow-x: hidden;

+  }

 }

 .my-info {

@@ -192,6 +197,10 @@

 }

 .friends {

+  height: inherit;

+  overflow-x: hidden;

+  overflow-y: auto;

+

   .group-header {

     margin: 16px 3px 3px;

     font-size: 12px;

@@ -385,6 +394,7 @@

 .tabbar {

   display: inline-block;

   margin-bottom: -3px;

+  width: 750px;

   .tab {

     background: #f7f6f5;

@@ -436,6 +446,7 @@

   background: white;

   padding: 9px;

   min-height: 367px;

+  width: 730px;

   .event {

     color: $status-color;

@@ -14,18 +14,19 @@

 .container

   .leftside.left

-    .roster.border.no-top-border.top-border#height-setter-1

+    .roster.border.no-top-border.top-border

       .my-info#js-me

-      .friends

-        #js-active-friends

-        #js-inactive-friends

-      .toolbox

-        %input#js-search-contacts{type: 'search', placeholder: "#{I18n.t('chat.roster.search')}", name: 'contact'}

-        %a{ href: '#'}

-          %span.icon-cog

+      .wrap#height-setter-1

+        .friends

+          #js-active-friends

+          #js-inactive-friends

+        .toolbox

+          %input#js-search-contacts{type: 'search', placeholder: "#{I18n.t('chat.roster.search')}", name: 'contact'}

+          %a{ href: '#'}

+            %span.icon-cog

   .chatting-window.left.rightside

     .tabbar#tabbar

-      #js-tabbar

+      .wrap#js-tabbar

     #conversation-js

       -#.conversation.clear.border

         -#.messages#height-setter-2{style: "overflow: auto;"}