diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
index a1b4b9d37..261402c99 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.cpp
@@ -325,6 +325,12 @@ void MessagesDialog::preModelUpdate()
     mTmpSavedSelectedIds.clear();
     getSelectedMessages(mTmpSavedSelectedIds);
 
+    mTmpSavedCurrentId.clear();
+    const QModelIndex& m = ui.messageTreeWidget->currentIndex();
+    if (m.isValid()) {
+        mTmpSavedCurrentId = m.sibling(m.row(), RsMessageModel::COLUMN_THREAD_MSGID).data(RsMessageModel::MsgIdRole).toString();
+    }
+
     std::cerr << "Pre-change: saving selection for " << mTmpSavedSelectedIds.size() << " indexes" << std::endl;
 }
 
@@ -342,6 +348,13 @@ void MessagesDialog::postModelUpdate()
     }
 
     ui.messageTreeWidget->selectionModel()->select(sel,QItemSelectionModel::SelectCurrent);
+
+    if (!mTmpSavedCurrentId.isEmpty()) {
+        QModelIndex index = mMessageProxyModel->mapFromSource(mMessageModel->getIndexOfMessage(mTmpSavedCurrentId.toStdString()));
+        if (index.isValid()) {
+            ui.messageTreeWidget->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Select);
+        }
+    }
 }
 
 void MessagesDialog::sortColumn(int col,Qt::SortOrder so)
diff --git a/retroshare-gui/src/gui/msgs/MessagesDialog.h b/retroshare-gui/src/gui/msgs/MessagesDialog.h
index 497c7a06d..75a53ad4b 100644
--- a/retroshare-gui/src/gui/msgs/MessagesDialog.h
+++ b/retroshare-gui/src/gui/msgs/MessagesDialog.h
@@ -159,6 +159,7 @@ private:
   Ui::MessagesDialog ui;
 
   QList<QString> mTmpSavedSelectedIds;
+  QString mTmpSavedCurrentId;
   QModelIndex lastSelectedIndex;
 
   RsEventsHandlerId_t mEventHandlerId;