diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index e09174f41..49fc7a9f5 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -1237,8 +1237,16 @@ void MessagesDialog::insertMessages()
             else if(it->msgflags & RS_MSG_DISTANT)
             {
                 item->setIcon(COLUMN_SIGNATURE, QIcon(":/images/blue_lock_open.png")) ;
-                item->setToolTip(COLUMN_SIGNATURE, tr("This message comes from a distant person.")) ;
                 item->setIcon(COLUMN_SUBJECT, QIcon(":/images/message-mail-read.png")) ;
+                
+                if (msgbox == RS_MSG_INBOX )
+                {
+                    item->setToolTip(COLUMN_SIGNATURE, tr("This message comes from a distant person.")) ;
+                }
+                else if  (msgbox == RS_MSG_OUTBOX)
+                {
+                    item->setToolTip(COLUMN_SIGNATURE, tr("This message goes to a distant person.")) ;
+                }
 
                 if(it->msgflags & RS_MSG_SIGNED)
                 {
diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index ea2a7d933..553912f99 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -244,6 +244,9 @@ void SearchDialog::processSettings(bool bLoad)
 
         // state of splitter
         ui.splitter->restoreState(Settings->value("Splitter").toByteArray());
+        
+        ui._max_results_SB->setValue(Settings->value("MaxResults").toInt());
+        
     } else {
         // save settings
 
@@ -252,6 +255,8 @@ void SearchDialog::processSettings(bool bLoad)
 
         // state of splitter
         Settings->setValue("Splitter", ui.splitter->saveState());
+        
+        Settings->setValue("MaxResults",  ui._max_results_SB->value());
     }
 
     Settings->endGroup();