From fe5c4cab4608a6b3ded682f4a69da14916cc1d37 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 12 May 2015 03:56:13 +0200
Subject: [PATCH] don't reinit conversation when coming back to activity.
 avoids unnecessary scrolling

---
 .../java/eu/siacs/conversations/ui/ConversationActivity.java  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index b11ff0024..6e175d8ef 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -927,9 +927,7 @@ public class ConversationActivity extends XmppActivity
 			}
 			this.mConversationFragment.reInit(getSelectedConversation());
 			mOpenConverstaion = null;
-		} else if (getSelectedConversation() != null) {
-			this.mConversationFragment.reInit(getSelectedConversation());
-		} else {
+		} else if (getSelectedConversation() == null) {
 			showConversationsOverview();
 			mPendingImageUris.clear();
 			mPendingFileUris.clear();