diff --git a/app/src/main/java/io/github/chronosx88/influence/presenters/ChatPresenter.kt b/app/src/main/java/io/github/chronosx88/influence/presenters/ChatPresenter.kt
index f7c89c5..016d734 100644
--- a/app/src/main/java/io/github/chronosx88/influence/presenters/ChatPresenter.kt
+++ b/app/src/main/java/io/github/chronosx88/influence/presenters/ChatPresenter.kt
@@ -179,6 +179,7 @@ class ChatPresenter(private val view: CoreContracts.IChatViewContract, private v
                     chatEntity.firstMessageUid = query.mamResultExtensions[0].id
                     LocalDBWrapper.updateChatEntity(chatEntity)
                 }
+                EventBus.getDefault().post(LastMessageEvent(chatID, GenericMessage(LocalDBWrapper.getLastMessage(chatID))))
             }
         }
     }
diff --git a/app/src/main/java/io/github/chronosx88/influence/views/ChatActivity.kt b/app/src/main/java/io/github/chronosx88/influence/views/ChatActivity.kt
index 053d170..6b57823 100644
--- a/app/src/main/java/io/github/chronosx88/influence/views/ChatActivity.kt
+++ b/app/src/main/java/io/github/chronosx88/influence/views/ChatActivity.kt
@@ -69,7 +69,6 @@ class ChatActivity : AppCompatActivity(), CoreContracts.IChatViewContract {
         presenter = ChatPresenter(this, intent.getStringExtra("chatID"))
         loadAvatarFromIntent(intent)
         presenter!!.loadLocalMessages()
-        presenter!!.loadRecentPageMessages()
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -119,5 +118,8 @@ class ChatActivity : AppCompatActivity(), CoreContracts.IChatViewContract {
         return true
     }
 
-
+    override fun onResume() {
+        super.onResume()
+        presenter!!.loadRecentPageMessages()
+    }
 }