diff --git a/src/librssguard/gui/messagepreviewer.cpp b/src/librssguard/gui/messagepreviewer.cpp
index 31e03c771..90510f0d0 100755
--- a/src/librssguard/gui/messagepreviewer.cpp
+++ b/src/librssguard/gui/messagepreviewer.cpp
@@ -102,10 +102,15 @@ void MessagePreviewer::hideToolbar() {
 }
 
 void MessagePreviewer::loadMessage(const Message& message, RootItem* root) {
-  m_verticalScrollBarPosition = m_txtMessage->verticalScrollBarPosition();
-
   bool same_message = message.m_id == m_message.m_id && m_root == root;
 
+  if (same_message) {
+    m_verticalScrollBarPosition = m_txtMessage->verticalScrollBarPosition();
+  }
+  else {
+    m_verticalScrollBarPosition = 0.0;
+  }
+
   m_message = message;
   m_root = root;
 
diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp
index 7dc3a3ebc..c706aa8f7 100644
--- a/src/librssguard/gui/messagesview.cpp
+++ b/src/librssguard/gui/messagesview.cpp
@@ -465,8 +465,6 @@ void MessagesView::deleteSelectedMessages() {
 
   if (current_index.isValid()) {
     setCurrentIndex(current_index);
-
-    emit currentMessageChanged(m_sourceModel->messageAt(m_proxyModel->mapToSource(current_index).row()), m_sourceModel->loadedItem());
   }
   else {
     emit currentMessageRemoved();