diff --git a/app/views/shared/logged_in/xmpp_chat.html.erb b/app/views/shared/logged_in/xmpp_chat.html.erb
index 8a8b4eb..77086a4 100644
--- a/app/views/shared/logged_in/xmpp_chat.html.erb
+++ b/app/views/shared/logged_in/xmpp_chat.html.erb
@@ -19,6 +19,7 @@
           <%= profile_image(user, :portrait, :class => 'avatar') %>
           <%= user_status_menu('icon-menu-offline', _('Offline')) %>
         </div>
+        <a href="#" class="back"><%= _('Close') %></a>
         <div class='dialog-error' style='display: none'></div>
       </div>
 
diff --git a/public/stylesheets/chat.css b/public/stylesheets/chat.css
index e993879..5e80e39 100644
--- a/public/stylesheets/chat.css
+++ b/public/stylesheets/chat.css
@@ -85,6 +85,7 @@
   right: 0;
   bottom: 0;
   padding: 0 20px 15px 15px;
+  border-top: 1px solid rgb(65, 65, 65);
 }
 .msie7 .conversation .input-div {
   padding-left: 5px;
@@ -124,6 +125,7 @@
 }
 #chat-window .history .message {
   padding: 10px 8px 10px 6px;
+  clear: both;
 }
 #chat-window .history .message .time {
   float: right;
@@ -215,14 +217,14 @@
   background-color: rgb(39, 39, 39);
 }
 .conversation .header .chat-target {
-  padding: 6px 6px 0 6px;
+  padding: 0px 6px 0 6px;
   display: inline-block;
   max-width: 70%;
 }
 .conversation .header .other-name {
  color: rgb(238, 238, 238);
 }
-.conversation .header .back {
+#chat .back {
   float: right;
   margin: 6px;
   padding: 7px;
@@ -232,11 +234,16 @@
   font-weight: bold;
   color: white;
 }
-#chat #chat-window .other-name, #chat #chat-window .history .self-name, #chat #chat-window .history h5 {
+#chat #chat-window .other-name, #chat #chat-window .history .self-name, #chat #chat-window .history h5, #chat .toolbar #user-status span.other-name {
   color: #257CAD;
-  height: 23px;
   overflow: hidden;
-  vertical-align: top;
+  display: inline-block;
+  max-width: 140px;
+  width: 100%;
+}
+#chat .toolbar #user-status span, #chat #conversations .header .chat-target span {
+  width: auto;
+  color: rgb(238, 238, 238);
 }
 #chat #chat-window .history h5 {
   text-align: center;
@@ -251,6 +258,7 @@
 }
 #chat #user-status {
   padding: 2px 4px;
+  float: left;
 }
 #chat .user-status a {
   color: rgb(224, 224, 224);
--
libgit2 0.21.2