diff --git a/retroshare-gui/src/gui/chat/ChatStyle.cpp b/retroshare-gui/src/gui/chat/ChatStyle.cpp
index cb02d6062..e9d75dd93 100644
--- a/retroshare-gui/src/gui/chat/ChatStyle.cpp
+++ b/retroshare-gui/src/gui/chat/ChatStyle.cpp
@@ -325,8 +325,16 @@ QString ChatStyle::formatMessage(enumFormatMessage type, QString &name, QDateTim
 //	}
 //    }
 
+    // if the message is on same date show only time
+    QString timeFormat;
+//    if (timestamp.daysTo(QDateTime::currentDateTime()) == 0) {
+//        timeFormat = "hh:mm:ss";
+//    } else {
+        timeFormat = "dd.MM.yyyy hh:mm:ss";
+//    }
+
     QString formatMsg = style.replace("%name%", name)
-                             .replace("%timestamp%", timestamp.toString("hh:mm:ss"))
+                             .replace("%timestamp%", timestamp.toString(timeFormat))
                              .replace("%message%", msg);
 
     return formatMsg;
diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
index 82df1a63c..42ff84331 100644
--- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
+++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.cpp
@@ -68,6 +68,16 @@ ImHistoryBrowser::ImHistoryBrowser(bool isPrivateChatIn, IMHistoryKeeper &histKe
     foreach(IMHistoryItem item, historyItems) {
         addItem(item);
     }
+
+    QByteArray geometry = Settings->valueFromGroup("HistorieBrowser", "Geometry", QByteArray()).toByteArray();
+    if (geometry.isEmpty() == false) {
+        restoreGeometry(geometry);
+    }
+}
+
+ImHistoryBrowser::~ImHistoryBrowser()
+{
+    Settings->setValueToGroup("HistorieBrowser", "Geometry", saveGeometry());
 }
 
 void ImHistoryBrowser::historyAdd(IMHistoryItem item)
diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.h b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.h
index f0e2ea62f..ec77d3426 100644
--- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.h
+++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.h
@@ -38,7 +38,8 @@ public:
     /** Default constructor */
     ImHistoryBrowser(bool isPrivateChat, IMHistoryKeeper &histKeeper, QWidget *parent = 0, Qt::WFlags flags = 0);
     /** Default destructor */
-      
+    virtual ~ImHistoryBrowser();
+
 private slots:
     void historyAdd(IMHistoryItem item);
     void historyClear();
diff --git a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui
index 695253537..9061a9a12 100644
--- a/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui
+++ b/retroshare-gui/src/gui/im_history/ImHistoryBrowser.ui
@@ -17,6 +17,9 @@
    <iconset resource="../images.qrc">
     <normaloff>:/images/rstray3.png</normaloff>:/images/rstray3.png</iconset>
   </property>
+  <property name="sizeGripEnabled">
+   <bool>true</bool>
+  </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <layout class="QGridLayout" name="mainLayout">
@@ -103,7 +106,6 @@ border-image: url(:/images/closepressed.png)
  </widget>
  <resources>
   <include location="../images.qrc"/>
-  <include location="../images.qrc"/>
  </resources>
  <connections>
   <connection>
diff --git a/retroshare-gui/src/gui/qss/chat/history/incoming.htm b/retroshare-gui/src/gui/qss/chat/history/incoming.htm
index 10cb1c4c2..814d06e7b 100644
--- a/retroshare-gui/src/gui/qss/chat/history/incoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/incoming.htm
@@ -4,7 +4,7 @@
 <table class='incomingTable' width='100%'>
 <tr>
 <td class='header incomingHeader'>%name%</td>
-<td width='10%' align='left' class='time incomingTime'>[%timestamp%] </td>
+<td width='130' align='right' class='time incomingTime'>[%timestamp%]</td>
 
 </tr>
 </table>
diff --git a/retroshare-gui/src/gui/qss/chat/history/outgoing.htm b/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
index 4e326503c..2d5a39661 100644
--- a/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/history/outgoing.htm
@@ -4,7 +4,7 @@
 <table class='outgoingTable' width='100%'>
 <tr>
 <td class='header outgoingHeader'>%name%</td>
-<td width='10%' align='left' class='time outgoingTime'>[%timestamp%] </td>
+<td width='130' align='right' class='time outgoingTime'>[%timestamp%]</td>
 
 </tr>
 </table>
diff --git a/retroshare-gui/src/gui/qss/chat/private/hincoming.htm b/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
index ed710b73d..3cf8f548f 100644
--- a/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/hincoming.htm
@@ -1,16 +1,14 @@
 <style type="text/css">
 %css-style%
 </style>
-<table width='100%'>
+<table class='header hincomingHeader' width='100%'>
 <tr>
-<td class='header hincomingHeader'>%name%</td>
-<td width='10%' align='left' class='time hincomingTime'>[%timestamp%] </td>
-
+<td class='name'>%name%</td>
+<td width='130' align='right' class='time'>[%timestamp%]</td>
 </tr>
 </table>
 <table width="100%">
 <tr>
 <td>%message%</td>
 </tr>
-</table> 
-	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm b/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
index 13ddbabbd..44f3457ad 100644
--- a/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/houtgoing.htm
@@ -1,16 +1,14 @@
 <style type="text/css">
 %css-style%
 </style>
-<table width='100%'>
+<table class='header houtgoingHeader' width='100%'>
 <tr>
-<td class='header houtgoingHeader'>%name%</td>
-<td width='10%' align='left' class='time houtgoingTime'>[%timestamp%] </td>
-
+<td class='name'>%name%</td>
+<td width='130' align='right' class='time'>[%timestamp%]</td>
 </tr>
 </table>
 <table width="100%">
 <tr>
 <td>%message%</td>
 </tr>
-</table> 
-	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/qss/chat/private/incoming.htm b/retroshare-gui/src/gui/qss/chat/private/incoming.htm
index 017935438..ec7cd8b56 100644
--- a/retroshare-gui/src/gui/qss/chat/private/incoming.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/incoming.htm
@@ -1,16 +1,14 @@
 <style type="text/css">
 %css-style%
 </style>
-<table width='100%'>
+<table class='incomingHeader' width='100%'>
 <tr>
-<td class='header incomingHeader'>%name%</td>
-<td width='10%' align='left' class='time incomingTime'>[%timestamp%] </td>
-
+<td class='name'>%name%</td>
+<td width='130' align='right' class='time'>[%timestamp%]</td>
 </tr>
 </table>
 <table width="100%">
 <tr>
 <td>%message%</td>
 </tr>
-</table> 
-	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/qss/chat/private/main.css b/retroshare-gui/src/gui/qss/chat/private/main.css
index f7e30f25e..fb120ff5f 100644
--- a/retroshare-gui/src/gui/qss/chat/private/main.css
+++ b/retroshare-gui/src/gui/qss/chat/private/main.css
@@ -1,4 +1,4 @@
-.header {
+.name{
 	font-weight: bold;
 }
 
@@ -11,41 +11,20 @@
 	color: #295b07;
 }
 
-.incomingTime {
-	background-color:#dfedff;
-	color: #295b07;
-}
-
 .outgoingHeader {
 	background-color:#f5f5f5;
 	border-color:#fafafa #e3e3e3 #e3e3e3 #fafafa;
 	color: #244578;
 }
 
-.outgoingTime {
-	background-color:#f5f5f5;
-	color: #244578;
-}
-
 .hincomingHeader {
 	background-color:#dfedff;
 	border-color:#fafafa #d1dfef #d1dfef #fafafa;
 	color: #295b07;
 }
 
-.hincomingTime {
-	background-color:#dfedff;
-	color: #295b07;
-}
-
 .houtgoingHeader {
 	background-color:#f5f5f5;
 	border-color:#fafafa #e3e3e3 #e3e3e3 #fafafa;
 	color: #244578;
 }
-
-.houtgoingTime {
-	background-color:#f5f5f5;
-	color: #244578;
-}
-
diff --git a/retroshare-gui/src/gui/qss/chat/private/outgoing.htm b/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
index 45630b08b..6c5dc7d91 100644
--- a/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
+++ b/retroshare-gui/src/gui/qss/chat/private/outgoing.htm
@@ -1,16 +1,14 @@
 <style type="text/css">
 %css-style%
 </style>
-<table width='100%'>
+<table class='outgoingHeader' width='100%'>
 <tr>
-<td class='header outgoingHeader'>%name%</td>
-<td width='10%' align='left' class='time outgoingTime'>[%timestamp%] </td>
-
+<td class='name'>%name%</td>
+<td width='130' align='right' class='time'>[%timestamp%]</td>
 </tr>
 </table>
 <table width="100%">
 <tr>
 <td>%message%</td>
 </tr>
-</table> 
-	
\ No newline at end of file
+</table> 
\ No newline at end of file
diff --git a/retroshare-gui/src/lang/retroshare_de.qm b/retroshare-gui/src/lang/retroshare_de.qm
index 06cff9405..8d75b83a0 100644
Binary files a/retroshare-gui/src/lang/retroshare_de.qm and b/retroshare-gui/src/lang/retroshare_de.qm differ
diff --git a/retroshare-gui/src/lang/retroshare_de.ts b/retroshare-gui/src/lang/retroshare_de.ts
index 1dd191b0d..5b8f0bb81 100644
--- a/retroshare-gui/src/lang/retroshare_de.ts
+++ b/retroshare-gui/src/lang/retroshare_de.ts
@@ -7463,7 +7463,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <source>Browse Message History</source>
-        <translation>Nachrichtenverlauf Anzeigen</translation>
+        <translation>Nachrichtenverlauf anzeigen</translation>
     </message>
     <message>
         <source>Browse History</source>