move new activity back to original name

14 files changed, 1290 insertions, 1211 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 872a9e9cd..961c4df2a 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -77,7 +77,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".ui.ConversationsMainActivity"
+            android:name=".ui.ConversationActivity"
             android:label="@string/app_name"
             android:launchMode="singleTask"
             android:minWidth="300dp"
diff --git a/src/main/java/de/pixart/messenger/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index ba4b3dc4e..27ff6d538 100644
--- a/src/main/java/de/pixart/messenger/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -627,7 +627,7 @@ public class NotificationService {
     private PendingIntent createContentIntent(final String conversationUuid, final String downloadMessageUuid) {
         final Intent viewConversationIntent = new Intent(mXmppConnectionService, ConversationActivity.class);
         viewConversationIntent.setAction(ConversationActivity.ACTION_VIEW_CONVERSATION);
-        viewConversationIntent.putExtra(ConversationActivity.CONVERSATION, conversationUuid);
+        viewConversationIntent.putExtra(ConversationActivity.EXTRA_CONVERSATION, conversationUuid);
         if (downloadMessageUuid != null) {
             viewConversationIntent.putExtra(ConversationActivity.EXTRA_DOWNLOAD_UUID, downloadMessageUuid);
             return PendingIntent.getActivity(mXmppConnectionService,
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 66c64a719..085977932 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -76,7 +76,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
             DestroyMucDialog.setMessage(getString(R.string.destroy_muc_text, mConversation.getName()));
             DestroyMucDialog.setPositiveButton(getString(R.string.delete), (dialogInterface, i) -> {
                 Intent intent = new Intent(xmppConnectionService, ConversationActivity.class);
-                intent.setAction(ConversationActivity.ACTION_DESTROY_MUC);
+                intent.setAction(ConversationLegacyActivity.ACTION_DESTROY_MUC);
                 intent.putExtra("MUC_UUID", mConversation.getUuid());
                 Log.d(Config.LOGTAG, "Sending DESTROY intent for " + mConversation.getName());
                 startActivity(intent);
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
index cb3356c82..631c08227 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationActivity.java
@@ -1,957 +1,274 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
 package de.pixart.messenger.ui;
 
-import android.annotation.SuppressLint;
+import android.app.Fragment;
+import android.app.FragmentManager;
 import android.app.FragmentTransaction;
-import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.graphics.Typeface;
-import android.net.Uri;
-import android.os.Build;
+import android.databinding.DataBindingUtil;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.provider.Settings;
-import android.support.v4.widget.SlidingPaneLayout;
-import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
+import android.support.annotation.IdRes;
 import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
 import android.util.Log;
-import android.util.Pair;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.Surface;
 import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.TextView;
+import android.widget.PopupMenu;
 import android.widget.Toast;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
+import net.java.otr4j.session.SessionStatus;
 
 import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
-import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.databinding.ActivityConversationsBinding;
 import de.pixart.messenger.entities.Conversation;
-import de.pixart.messenger.entities.Message;
-import de.pixart.messenger.entities.MucOptions;
-import de.pixart.messenger.entities.Presence;
 import de.pixart.messenger.services.EmojiService;
-import de.pixart.messenger.services.UpdateService;
 import de.pixart.messenger.services.XmppConnectionService;
-import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate;
-import de.pixart.messenger.services.XmppConnectionService.OnConversationUpdate;
-import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate;
-import de.pixart.messenger.ui.adapter.ConversationAdapter;
-import de.pixart.messenger.utils.ExceptionHelper;
-import de.pixart.messenger.utils.UIHelper;
+import de.pixart.messenger.ui.interfaces.OnConversationArchived;
+import de.pixart.messenger.ui.interfaces.OnConversationRead;
+import de.pixart.messenger.ui.interfaces.OnConversationSelected;
+import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated;
 import de.pixart.messenger.xmpp.OnUpdateBlocklist;
-import de.pixart.messenger.xmpp.chatstate.ChatState;
-import de.pixart.messenger.xmpp.jid.InvalidJidException;
-import de.pixart.messenger.xmpp.jid.Jid;
 
 import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 
-public class ConversationActivity extends XmppActivity
-        implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener {
+public class ConversationActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
 
     public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW";
-    public static final String ACTION_DESTROY_MUC = "de.pixart.messenger.DESTROY_MUC";
-    public static final String CONVERSATION = "conversationUuid";
+    public static final String EXTRA_CONVERSATION = "conversationUuid";
     public static final String EXTRA_DOWNLOAD_UUID = "de.pixart.messenger.download_uuid";
-    public static final String TEXT = "text";
-    public static final String NICK = "nick";
-    public static final String PRIVATE_MESSAGE = "pm";
-
-    private static final String STATE_OPEN_CONVERSATION = "state_open_conversation";
-    private static final String STATE_PANEL_OPEN = "state_panel_open";
-    private static final String STATE_PENDING_IMAGE_URI = "state_pending_image_uri";
-    private static final String STATE_PENDING_PHOTO_URI = "state_pending_photo_uri";
-    private static final String STATE_FIRST_VISIBLE = "first_visible";
-    private static final String STATE_OFFSET_FROM_TOP = "offset_from_top";
-
-    private String mOpenConversation = null;
-    private boolean mPanelOpen = true;
-    private AtomicBoolean mShouldPanelBeOpen = new AtomicBoolean(false);
-    private Pair<Integer, Integer> mScrollPosition = null;
-    private boolean forbidProcessingPendings = false;
-
-    private boolean conversationWasSelectedByKeyboard = false;
-
-    private View mContentView;
-
-    private List<Conversation> conversationList = new ArrayList<>();
-    private Conversation swipedConversation = null;
-    private Conversation mSelectedConversation = null;
-    private ListView listView;
-    public ConversationFragment mConversationFragment;
-
-    private ArrayAdapter<Conversation> listAdapter;
-
-    private boolean mActivityPaused = false;
-    private AtomicBoolean mRedirected = new AtomicBoolean(false);
-    private boolean mUnprocessedNewIntent = false;
-    private boolean showLastSeen = false;
+    public static final String EXTRA_TEXT = "text";
+    public static final String EXTRA_NICK = "nick";
+    public static final String EXTRA_IS_PRIVATE_MESSAGE = "pm";
 
-    long FirstStartTime = -1;
+    //secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
+    private static final @IdRes
+    int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
 
-    String PREF_FIRST_START = "FirstStart";
-
-    public Conversation getSelectedConversation() {
-        return this.mSelectedConversation;
-    }
-
-    public void setSelectedConversation(Conversation conversation) {
-        this.mSelectedConversation = conversation;
-    }
-
-    public void showConversationsOverview() {
-        if (mConversationFragment != null) {
-            mConversationFragment.stopScrolling();
-            mConversationFragment.hideSearchField();
-        }
-        if (mContentView instanceof SlidingPaneLayout) {
-            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-            mShouldPanelBeOpen.set(true);
-            mSlidingPaneLayout.openPane();
-        }
-    }
+    private ActivityConversationsBinding binding;
 
     @Override
-    protected String getShareableUri() {
-        Conversation conversation = getSelectedConversation();
-        if (conversation != null) {
-            return conversation.getAccount().getShareableUri();
-        } else {
-            return "";
+    protected void refreshUiReal() {
+        for(@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+            refreshFragment(id);
         }
     }
 
-    public void hideConversationsOverview() {
-        if (mContentView instanceof SlidingPaneLayout) {
-            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-            mShouldPanelBeOpen.set(false);
-            mSlidingPaneLayout.closePane();
+    @Override
+    void onBackendConnected() {
+        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
+            notifyFragmentOfBackendConnected(id);
         }
+        invalidateActionBarTitle();
     }
 
-    public boolean isConversationsOverviewHideable() {
-        if (mContentView instanceof SlidingPaneLayout) {
-            return true;
-        } else {
-            return false;
+    private void notifyFragmentOfBackendConnected(@IdRes int id) {
+        final Fragment fragment = getFragmentManager().findFragmentById(id);
+        if (fragment != null && fragment instanceof XmppFragment) {
+            ((XmppFragment) fragment).onBackendConnected();
         }
     }
 
-    public boolean isConversationsOverviewVisable() {
-        if (mContentView instanceof SlidingPaneLayout) {
-            return mShouldPanelBeOpen.get();
-        } else {
-            return true;
+    private void refreshFragment(@IdRes int id) {
+        final Fragment fragment = getFragmentManager().findFragmentById(id);
+        if (fragment != null && fragment instanceof XmppFragment) {
+            ((XmppFragment) fragment).refresh();
         }
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         new EmojiService(this).init(useBundledEmoji());
-        if (savedInstanceState != null) {
-            mOpenConversation = savedInstanceState.getString(STATE_OPEN_CONVERSATION, null);
-            mPanelOpen = savedInstanceState.getBoolean(STATE_PANEL_OPEN, true);
-            int pos = savedInstanceState.getInt(STATE_FIRST_VISIBLE, -1);
-            int offset = savedInstanceState.getInt(STATE_OFFSET_FROM_TOP, 1);
-            if (pos >= 0 && offset <= 0) {
-                Log.d(Config.LOGTAG, "retrieved scroll position from instanceState " + pos + ":" + offset);
-                mScrollPosition = new Pair<>(pos, offset);
-            } else {
-                mScrollPosition = null;
-            }
-        }
-
-        setContentView(R.layout.fragment_conversations_overview);
-
-        this.mConversationFragment = new ConversationFragment();
-        FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        //transaction.replace(R.id.selected_conversation, this.mConversationFragment, "conversation");
-        transaction.commit();
-
-        listView = findViewById(R.id.list);
-        this.listAdapter = new ConversationAdapter(this, conversationList);
-        listView.setAdapter(this.listAdapter);
-
-        final ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE);
-        }
-
-        listView.setOnItemClickListener(new OnItemClickListener() {
-
-            @Override
-            public void onItemClick(AdapterView<?> arg0, View clickedView,
-                                    int position, long arg3) {
-                if (getSelectedConversation() != conversationList.get(position)) {
-                    ConversationActivity.this.mConversationFragment.stopScrolling();
-                    setSelectedConversation(conversationList.get(position));
-                    ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-                    conversationWasSelectedByKeyboard = false;
-                }
-                hideConversationsOverview();
-                openConversation();
-            }
-        });
-
-        //mContentView = findViewById(R.id.content_view_spl);
-        if (mContentView == null) {
-            //mContentView = findViewById(R.id.content_view_ll);
-        }
-        if (mContentView instanceof SlidingPaneLayout) {
-            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-            mSlidingPaneLayout.setShadowResourceLeft(R.drawable.es_slidingpane_shadow);
-            mSlidingPaneLayout.setSliderFadeColor(0);
-            mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
-
-                @Override
-                public void onPanelOpened(View arg0) {
-                    mShouldPanelBeOpen.set(true);
-                    updateActionBarTitle();
-                    invalidateOptionsMenu();
-                    hideKeyboard();
-                    if (xmppConnectionServiceBound) {
-                        xmppConnectionService.getNotificationService().setOpenConversation(null);
-                    }
-                    closeContextMenu();
-                    mConversationFragment.hideSearchField();
-                }
-
-                @Override
-                public void onPanelClosed(View arg0) {
-                    mShouldPanelBeOpen.set(false);
-                    openConversation();
-                }
-
-                @Override
-                public void onPanelSlide(View arg0, float arg1) {
-                    // TODO Auto-generated method stub
-
-                }
-            });
-        }
-    }
-
-    public boolean useBundledEmoji() {
-        return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
-    }
-
-    private boolean isPackageInstalled(String targetPackage) {
-        List<ApplicationInfo> packages;
-        PackageManager pm;
-        pm = getPackageManager();
-        packages = pm.getInstalledApplications(0);
-        for (ApplicationInfo packageInfo : packages) {
-            if (packageInfo.packageName.equals(targetPackage)) return true;
-        }
-        return false;
-    }
-
-    protected void AppUpdate(boolean PlayStore) {
-        if (PlayStore) {
-            return;
-        }
-        String PREFS_NAME = "UpdateTimeStamp";
-        SharedPreferences UpdateTimeStamp = getApplicationContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
-        long lastUpdateTime = UpdateTimeStamp.getLong("lastUpdateTime", 0);
-        Log.d(Config.LOGTAG, "AppUpdater: LastUpdateTime: " + lastUpdateTime);
-        if ((lastUpdateTime + (Config.UPDATE_CHECK_TIMER * 1000)) < System.currentTimeMillis()) {
-            lastUpdateTime = System.currentTimeMillis();
-            SharedPreferences.Editor editor = UpdateTimeStamp.edit();
-            editor.putLong("lastUpdateTime", lastUpdateTime);
-            editor.apply();
-            Log.d(Config.LOGTAG, "AppUpdater: CurrentTime: " + lastUpdateTime);
-            if (!installFromUnknownSourceAllowed() && !PlayStore) {
-                openInstallFromUnknownSourcesDialogIfNeeded();
-            } else {
-                UpdateService task = new UpdateService(this, PlayStore);
-                task.executeOnExecutor(UpdateService.THREAD_POOL_EXECUTOR, "false");
-                Log.d(Config.LOGTAG, "AppUpdater started");
-            }
-        } else {
-            Log.d(Config.LOGTAG, "AppUpdater stopped");
-            return;
-        }
-    }
-
-    @Override
-    public void switchToConversation(Conversation conversation) {
-        setSelectedConversation(conversation);
-        runOnUiThread(() -> {
-            ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-            openConversation();
-        });
-    }
-
-    private void updateActionBarTitle() {
-        updateActionBarTitle(isConversationsOverviewHideable() && !isConversationsOverviewVisable());
-    }
-
-    private void updateActionBarTitle(boolean titleShouldBeName) {
-        final ActionBar ab = getSupportActionBar();
-        final Conversation conversation = getSelectedConversation();
-        if (ab != null) {
-            if (titleShouldBeName && conversation != null) {
-                if ((ab.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != ActionBar.DISPLAY_HOME_AS_UP) {
-                    ab.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
-                }
-                ab.setDisplayShowTitleEnabled(false);
-                ab.setDisplayShowCustomEnabled(true);
-                ab.setCustomView(R.layout.ab_title);
-                TextView abtitle = findViewById(android.R.id.text1);
-                TextView absubtitle = findViewById(android.R.id.text2);
-                abtitle.setText(conversation.getName());
-                abtitle.setOnClickListener(this);
-                abtitle.setSelected(true);
-                if (conversation.getMode() == Conversation.MODE_SINGLE && !this.getSelectedConversation().withSelf()) {
-                    ChatState state = conversation.getIncomingChatState();
-                    if (conversation.getContact().getShownStatus() == Presence.Status.OFFLINE) {
-                        absubtitle.setText(getString(R.string.account_status_offline));
-                        absubtitle.setSelected(true);
-                        absubtitle.setOnClickListener(this);
-                    } else {
-                        if (state == ChatState.COMPOSING) {
-                            absubtitle.setText(getString(R.string.is_typing));
-                            absubtitle.setTypeface(null, Typeface.BOLD_ITALIC);
-                            absubtitle.setSelected(true);
-                            absubtitle.setOnClickListener(this);
-                        } else {
-                            if (showLastSeen && conversation.getContact().getLastseen() > 0) {
-                                absubtitle.setText(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
-                            } else {
-                                absubtitle.setText(getString(R.string.account_status_online));
-                            }
-                            absubtitle.setSelected(true);
-                            absubtitle.setOnClickListener(this);
-                        }
-                    }
-                } else {
-                    if (conversation.getParticipants() != null) {
-                        ChatState state = ChatState.COMPOSING;
-                        List<MucOptions.User> userWithChatStates = conversation.getMucOptions().getUsersWithChatState(state, 5);
-                        if (userWithChatStates.size() == 0) {
-                            state = ChatState.PAUSED;
-                            userWithChatStates = conversation.getMucOptions().getUsersWithChatState(state, 5);
-                        }
-                        List<MucOptions.User> users = conversation.getMucOptions().getUsers(true);
-                        if (state == ChatState.COMPOSING) {
-                            if (userWithChatStates.size() > 0) {
-                                if (userWithChatStates.size() == 1) {
-                                    MucOptions.User user = userWithChatStates.get(0);
-                                    absubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
-                                } else {
-                                    StringBuilder builder = new StringBuilder();
-                                    for (MucOptions.User user : userWithChatStates) {
-                                        if (builder.length() != 0) {
-                                            builder.append(", ");
-                                        }
-                                        builder.append(UIHelper.getDisplayName(user));
-                                    }
-                                    absubtitle.setText(getString(R.string.contacts_are_typing, builder.toString()));
-                                }
-                            }
-                        } else {
-                            if (users.size() == 1) {
-                                absubtitle.setText(getString(R.string.one_participant));
-                            } else {
-                                absubtitle.setText(getString(R.string.more_participants, users.size()));
-                            }
-                        }
-                        absubtitle.setSelected(true);
-                        absubtitle.setOnClickListener(this);
-                    } else {
-                        absubtitle.setText(R.string.no_participants);
-                        abtitle.setSelected(true);
-                        absubtitle.setOnClickListener(this);
-                    }
-                }
-
-            } else {
-                if ((ab.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) == ActionBar.DISPLAY_HOME_AS_UP) {
-                    ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE);
-                }
-                ab.setDisplayShowTitleEnabled(true);
-                ab.setDisplayShowCustomEnabled(false);
-                ab.setTitle(R.string.app_name);
-                ab.setSubtitle(null);
-            }
-        }
-    }
-
-    private void openConversation() {
-        this.updateActionBarTitle();
-        this.invalidateOptionsMenu();
-        if (xmppConnectionServiceBound) {
-            final Conversation conversation = getSelectedConversation();
-            xmppConnectionService.getNotificationService().setOpenConversation(conversation);
-            sendReadMarkerIfNecessary(conversation);
-        }
-        listAdapter.notifyDataSetChanged();
-    }
-
-    public void sendReadMarkerIfNecessary(final Conversation conversation) {
-        if (!mActivityPaused && !mUnprocessedNewIntent && conversation != null) {
-            xmppConnectionService.sendReadMarker(conversation);
-        }
+        this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
+        this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
+        this.initializeFragments();
+        this.invalidateActionBarTitle();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.activity_conversations, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            showConversationsOverview();
-            return true;
-        } else if (item.getItemId() == R.id.action_add) {
-            startActivity(new Intent(this, StartConversationActivity.class));
-            return true;
+    public void onConversationSelected(Conversation conversation) {
+        Log.d(Config.LOGTAG, "selected " + conversation.getName());
+        ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
+        final boolean mainNeedsRefresh;
+        if (conversationFragment == null) {
+            mainNeedsRefresh = false;
+            conversationFragment = new ConversationFragment();
+            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
+            fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
+            fragmentTransaction.addToBackStack(null);
+            fragmentTransaction.commit();
         } else {
-            return super.onOptionsItemSelected(item);
+            mainNeedsRefresh = true;
         }
-    }
-
-    public void endConversation(Conversation conversation) {
-        endConversation(conversation, true, true);
-    }
-
-    public void endConversation(Conversation conversation, boolean showOverview, boolean reinit) {
-        if (showOverview) {
-            showConversationsOverview();
-        }
-        xmppConnectionService.archiveConversation(conversation);
-        if (reinit) {
-            if (conversationList.size() > 0) {
-                setSelectedConversation(conversationList.get(0));
-                this.mConversationFragment.reInit(getSelectedConversation());
-            } else {
-                setSelectedConversation(null);
-                if (mRedirected.compareAndSet(false, true)) {
-                    Intent intent = new Intent(this, StartConversationActivity.class);
-                    intent.putExtra("init", true);
-                    startActivity(intent);
-                    finish();
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onBackPressed() {
-        if (!isConversationsOverviewVisable() && mConversationFragment.isSearchFieldVisible()) {
-            mConversationFragment.hideSearchField();
-        } else if (!isConversationsOverviewVisable()) {
-            showConversationsOverview();
-        } else {
-            super.onBackPressed();
+        conversationFragment.reInit(conversation);
+        if (mainNeedsRefresh) {
+            refreshFragment(R.id.main_fragment);
         }
     }
 
     @Override
-    public boolean onKeyUp(int key, KeyEvent event) {
-        int rotation = getWindowManager().getDefaultDisplay().getRotation();
-        final int upKey;
-        final int downKey;
-        switch (rotation) {
-            case Surface.ROTATION_90:
-                upKey = KeyEvent.KEYCODE_DPAD_LEFT;
-                downKey = KeyEvent.KEYCODE_DPAD_RIGHT;
-                break;
-            case Surface.ROTATION_180:
-                upKey = KeyEvent.KEYCODE_DPAD_DOWN;
-                downKey = KeyEvent.KEYCODE_DPAD_UP;
-                break;
-            case Surface.ROTATION_270:
-                upKey = KeyEvent.KEYCODE_DPAD_RIGHT;
-                downKey = KeyEvent.KEYCODE_DPAD_LEFT;
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                FragmentManager fm = getFragmentManager();
+                if (fm.getBackStackEntryCount() > 0) {
+                    fm.popBackStack();
+                    return true;
+                }
                 break;
-            case Surface.ROTATION_0:
-            default:
-                upKey = KeyEvent.KEYCODE_DPAD_UP;
-                downKey = KeyEvent.KEYCODE_DPAD_DOWN;
-        }
-        final boolean modifier = event.isCtrlPressed() || (event.getMetaState() & KeyEvent.META_ALT_LEFT_ON) != 0;
-        if (modifier && key == KeyEvent.KEYCODE_TAB && isConversationsOverviewHideable()) {
-            toggleConversationsOverview();
-            return true;
-        } else if (modifier && key == KeyEvent.KEYCODE_SPACE) {
-            startActivity(new Intent(this, StartConversationActivity.class));
-            return true;
-        } else if (modifier && key == downKey) {
-            if (isConversationsOverviewHideable() && !isConversationsOverviewVisable()) {
-                showConversationsOverview();
-            }
-            return selectDownConversation();
-        } else if (modifier && key == upKey) {
-            if (isConversationsOverviewHideable() && !isConversationsOverviewVisable()) {
-                showConversationsOverview();
-            }
-            return selectUpConversation();
-        } else if (modifier && key == KeyEvent.KEYCODE_1) {
-            return openConversationByIndex(0);
-        } else if (modifier && key == KeyEvent.KEYCODE_2) {
-            return openConversationByIndex(1);
-        } else if (modifier && key == KeyEvent.KEYCODE_3) {
-            return openConversationByIndex(2);
-        } else if (modifier && key == KeyEvent.KEYCODE_4) {
-            return openConversationByIndex(3);
-        } else if (modifier && key == KeyEvent.KEYCODE_5) {
-            return openConversationByIndex(4);
-        } else if (modifier && key == KeyEvent.KEYCODE_6) {
-            return openConversationByIndex(5);
-        } else if (modifier && key == KeyEvent.KEYCODE_7) {
-            return openConversationByIndex(6);
-        } else if (modifier && key == KeyEvent.KEYCODE_8) {
-            return openConversationByIndex(7);
-        } else if (modifier && key == KeyEvent.KEYCODE_9) {
-            return openConversationByIndex(8);
-        } else if (modifier && key == KeyEvent.KEYCODE_0) {
-            return openConversationByIndex(9);
-        } else {
-            return super.onKeyUp(key, event);
         }
+        return super.onOptionsItemSelected(item);
     }
 
-    private void toggleConversationsOverview() {
-        if (isConversationsOverviewVisable()) {
-            hideConversationsOverview();
-            if (mConversationFragment != null) {
-                mConversationFragment.setFocusOnInputField();
-            }
-        } else {
-            showConversationsOverview();
-        }
-    }
-
-    private boolean selectUpConversation() {
-        if (this.mSelectedConversation != null) {
-            int index = this.conversationList.indexOf(this.mSelectedConversation);
-            if (index > 0) {
-                return openConversationByIndex(index - 1);
-            }
-        }
-        return false;
-    }
-
-    private boolean selectDownConversation() {
-        if (this.mSelectedConversation != null) {
-            int index = this.conversationList.indexOf(this.mSelectedConversation);
-            if (index != -1 && index < this.conversationList.size() - 1) {
-                return openConversationByIndex(index + 1);
-            }
-        }
-        return false;
-    }
-
-    private boolean openConversationByIndex(int index) {
-        try {
-            this.conversationWasSelectedByKeyboard = true;
-            this.mConversationFragment.stopScrolling();
-            setSelectedConversation(this.conversationList.get(index));
-            this.mConversationFragment.reInit(getSelectedConversation());
-            if (index > listView.getLastVisiblePosition() - 1 || index < listView.getFirstVisiblePosition() + 1) {
-                this.listView.setSelection(index);
-            }
-            openConversation();
-            return true;
-        } catch (IndexOutOfBoundsException e) {
-            return false;
-        }
-    }
-
-    @Override
-    protected void onNewIntent(final Intent intent) {
-        if (intent != null && ACTION_VIEW_CONVERSATION.equals(intent.getAction())) {
-            mOpenConversation = null;
-            mUnprocessedNewIntent = true;
-            if (xmppConnectionServiceBound) {
-                handleViewConversationIntent(intent);
-                intent.setAction(Intent.ACTION_MAIN);
-            } else {
-                setIntent(intent);
-            }
-        } else if (intent != null && ACTION_DESTROY_MUC.equals(intent.getAction())) {
-            final Bundle extras = intent.getExtras();
-            if (extras != null && extras.containsKey("MUC_UUID")) {
-                Log.d(Config.LOGTAG, "Get " + intent.getAction() + " intent for " + extras.getString("MUC_UUID"));
-                Conversation conversation = xmppConnectionService.findConversationByUuid(extras.getString("MUC_UUID"));
-                ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-                xmppConnectionService.destroyMuc(conversation);
-                endConversation(conversation);
-            }
-        }
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        this.mRedirected.set(false);
-        if (this.xmppConnectionServiceBound) {
-            this.onBackendConnected();
-        }
-        if (conversationList.size() >= 1) {
-            this.onConversationUpdate();
-        }
-        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-        this.showLastSeen = preferences.getBoolean("last_activity", false);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        this.mActivityPaused = true;
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        final int theme = findTheme();
-        final boolean usingEnterKey = usingEnterKey();
-        if (this.mTheme != theme || usingEnterKey != mUsingEnterKey) {
-            recreate();
-        }
-        this.mActivityPaused = false;
-        if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
-            sendReadMarkerIfNecessary(getSelectedConversation());
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(final Bundle savedInstanceState) {
-        Conversation conversation = getSelectedConversation();
-        if (conversation != null) {
-            savedInstanceState.putString(STATE_OPEN_CONVERSATION, conversation.getUuid());
-            Pair<Integer, Integer> scrollPosition = mConversationFragment.getScrollPosition();
-            if (scrollPosition != null) {
-                savedInstanceState.putInt(STATE_FIRST_VISIBLE, scrollPosition.first);
-                savedInstanceState.putInt(STATE_OFFSET_FROM_TOP, scrollPosition.second);
-            }
-        } else {
-            savedInstanceState.remove(STATE_OPEN_CONVERSATION);
-        }
-        savedInstanceState.putBoolean(STATE_PANEL_OPEN, isConversationsOverviewVisable());
-        /*if (this.mPendingImageUris.size() >= 1) {
-            Log.d(Config.LOGTAG, "ConversationActivity.onSaveInstanceState() - saving pending image uri");
-            savedInstanceState.putString(STATE_PENDING_IMAGE_URI, this.mPendingImageUris.get(0).toString());
-        } else if (this.mPendingPhotoUris.size() >= 1) {
-            savedInstanceState.putString(STATE_PENDING_PHOTO_URI, this.mPendingPhotoUris.get(0).toString());
-        } else {
-            savedInstanceState.remove(STATE_PENDING_IMAGE_URI);
-            savedInstanceState.remove(STATE_PENDING_PHOTO_URI);
-        }*/
-        super.onSaveInstanceState(savedInstanceState);
-    }
-
-    private void clearPending() {
-        mConversationFragment.clearPending();
-    }
-
-    private void redirectToStartConversationActivity(boolean noAnimation) {
-        Account pendingAccount = xmppConnectionService.getPendingAccount();
-        if (pendingAccount == null) {
-            Intent startConversationActivity = new Intent(this, StartConversationActivity.class);
-            startConversationActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
-            if (noAnimation) {
-                startConversationActivity.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
-            }
-            startConversationActivity.putExtra("init", true);
-            startActivity(startConversationActivity);
-            if (noAnimation) {
-                overridePendingTransition(0, 0);
-            }
-        } else {
-            switchToAccount(pendingAccount, true);
-        }
-    }
-
-    @Override
-    void onBackendConnected() {
-        this.xmppConnectionService.getNotificationService().setIsInForeground(true);
-        updateConversationList();
-        final Intent intent = getIntent();
-        final Bundle extras = intent.getExtras();
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (extras != null && extras.containsKey(PREF_FIRST_START)) {
-                FirstStartTime = extras.getLong(PREF_FIRST_START);
-                Log.d(Config.LOGTAG, "Get first start time from StartUI: " + FirstStartTime);
-            }
-        } else {
-            FirstStartTime = System.currentTimeMillis();
-            Log.d(Config.LOGTAG, "Device is running Android < SDK 23, no restart required: " + FirstStartTime);
-        }
-
-        if (mPendingConferenceInvite != null) {
-            if (mPendingConferenceInvite.execute(this)) {
-                mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
-                mToast.show();
-            }
-            mPendingConferenceInvite = null;
-        }
-
-        if (FirstStartTime == 0) {
-            Log.d(Config.LOGTAG, "First start time: " + FirstStartTime + ", restarting App");
-            //write first start timestamp to file
-            FirstStartTime = System.currentTimeMillis();
-            SharedPreferences FirstStart = getApplicationContext().getSharedPreferences(PREF_FIRST_START, Context.MODE_PRIVATE);
-            SharedPreferences.Editor editor = FirstStart.edit();
-            editor.putLong(PREF_FIRST_START, FirstStartTime);
-            editor.commit();
-            // restart
-            Intent restartintent = getBaseContext().getPackageManager().getLaunchIntentForPackage(getBaseContext().getPackageName());
-            restartintent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-            restartintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivity(restartintent);
-            System.exit(0);
-        }
-
-        if (xmppConnectionService.getAccounts().size() == 0) {
-            if (mRedirected.compareAndSet(false, true)) {
-                if (Config.X509_VERIFICATION) {
-                    Intent redirectionIntent = new Intent(this, ManageAccountActivity.class);
-                    redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
-                    startActivity(redirectionIntent);
-                    overridePendingTransition(0, 0);
-                } else if (Config.MAGIC_CREATE_DOMAIN != null) {
-                    WelcomeActivity.launch(this);
-                } else {
-                    Intent editAccount = new Intent(this, EditAccountActivity.class);
-                    editAccount.putExtra("init", true);
-                    editAccount.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
-                    startActivity(editAccount);
-                    overridePendingTransition(0, 0);
+    private void initializeFragments() {
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
+        if (mainFragment != null) {
+            Log.d(Config.LOGTAG, "initializeFragment(). main fragment exists");
+            if (binding.secondaryFragment != null) {
+                if (mainFragment instanceof ConversationFragment) {
+                    Log.d(Config.LOGTAG, "gained secondary fragment. moving...");
+                    getFragmentManager().popBackStack();
+                    transaction.remove(mainFragment);
+                    transaction.commit();
+                    getFragmentManager().executePendingTransactions();
+                    transaction = getFragmentManager().beginTransaction();
+                    transaction.replace(R.id.secondary_fragment, mainFragment);
+                    transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
+                    transaction.commit();
+                    return;
                 }
-            }
-        } else if (conversationList.size() <= 0) {
-            if (mRedirected.compareAndSet(false, true)) {
-                redirectToStartConversationActivity(true);
-            }
-        } else if (selectConversationByUuid(mOpenConversation)) {
-            if (mPanelOpen) {
-                showConversationsOverview();
             } else {
-                if (isConversationsOverviewHideable()) {
-                    openConversation();
-                    updateActionBarTitle(true);
+                if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
+                    Log.d(Config.LOGTAG, "lost secondary fragment. moving...");
+                    transaction.remove(secondaryFragment);
+                    transaction.commit();
+                    getFragmentManager().executePendingTransactions();
+                    transaction = getFragmentManager().beginTransaction();
+                    transaction.replace(R.id.main_fragment, secondaryFragment);
+                    transaction.addToBackStack(null);
+                    transaction.commit();
+                    return;
                 }
             }
-            if (this.mConversationFragment.reInit(getSelectedConversation())) {
-                Log.d(Config.LOGTAG, "setting scroll position on fragment");
-                this.mConversationFragment.setScrollPosition(mScrollPosition);
-            }
-            mOpenConversation = null;
-        } else if (intent != null && ACTION_VIEW_CONVERSATION.equals(intent.getAction())) {
-            clearPending();
-            handleViewConversationIntent(intent);
-            intent.setAction(Intent.ACTION_MAIN);
-        } else if (getSelectedConversation() == null) {
-            reInitLatestConversation();
         } else {
-            this.mConversationFragment.messageListAdapter.updatePreferences();
-            //this.mConversationFragment.messagesView.invalidateViews();
-            this.mConversationFragment.setupIme();
+            transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
         }
 
-        if (xmppConnectionService.getAccounts().size() != 0) {
-            if (xmppConnectionService.hasInternetConnection()) {
-                if (xmppConnectionService.isWIFI() || (xmppConnectionService.isMobile() && !xmppConnectionService.isMobileRoaming())) {
-                    if (!xmppConnectionService.installedFromFDroid()) {
-                        AppUpdate(xmppConnectionService.installedFromPlayStore());
-                    }
-                }
-            }
-        }
-
-        mConversationFragment.onBackendConnected();
-
-        if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService) && !mRedirected.get()) {
-            openBatteryOptimizationDialogIfNeeded();
-        }
-
-        if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
-            xmppConnectionService.getNotificationService().setOpenConversation(null);
-        } else {
-            xmppConnectionService.getNotificationService().setOpenConversation(getSelectedConversation());
+        if (binding.secondaryFragment != null && secondaryFragment == null) {
+            transaction.replace(R.id.secondary_fragment, new ConversationFragment());
         }
+        transaction.commit();
     }
 
-    private boolean isStopping() {
-        if (Build.VERSION.SDK_INT >= 17) {
-            return isFinishing() || isDestroyed();
-        } else {
-            return isFinishing();
+    private void invalidateActionBarTitle() {
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+            if (mainFragment != null && mainFragment instanceof ConversationFragment) {
+                final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
+                if (conversation != null) {
+                    actionBar.setTitle(conversation.getName());
+                    actionBar.setDisplayHomeAsUpEnabled(true);
+                    return;
+                }
+            }
+            actionBar.setTitle(R.string.app_name);
+            actionBar.setDisplayHomeAsUpEnabled(false);
         }
     }
 
-    private void reInitLatestConversation() {
-        showConversationsOverview();
-        clearPending();
-        setSelectedConversation(conversationList.get(0));
-        this.mConversationFragment.reInit(getSelectedConversation());
+    public boolean useBundledEmoji() {
+        return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
     }
 
-    private void handleViewConversationIntent(final Intent intent) {
-        final String uuid = intent.getStringExtra(CONVERSATION);
-        final String downloadUuid = intent.getStringExtra(EXTRA_DOWNLOAD_UUID);
-        final String text = intent.getStringExtra(TEXT);
-        final String nick = intent.getStringExtra(NICK);
-        final boolean pm = intent.getBooleanExtra(PRIVATE_MESSAGE, false);
-        this.mConversationFragment.stopScrolling();
-        if (selectConversationByUuid(uuid)) {
-            this.mConversationFragment.reInit(getSelectedConversation());
-            if (nick != null) {
-                if (pm) {
-                    Jid jid = getSelectedConversation().getJid();
-                    try {
-                        Jid next = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), nick);
-                        this.mConversationFragment.privateMessageWith(next);
-                    } catch (final InvalidJidException ignored) {
-                        //do nothing
-                    }
-                } else {
-                    this.mConversationFragment.highlightInConference(nick);
-                }
-            } else {
-                this.mConversationFragment.appendText(text);
-            }
-            hideConversationsOverview();
-            mUnprocessedNewIntent = false;
-            openConversation();
-            if (mContentView instanceof SlidingPaneLayout) {
-                updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet
-            }
-            if (downloadUuid != null) {
-                final Message message = mSelectedConversation.findMessageWithFileAndUuid(downloadUuid);
-                if (message != null) {
-                    //startDownloadable(message);
-                }
-            }
-        } else {
-            mUnprocessedNewIntent = false;
-
+    public void verifyOtrSessionDialog(final Conversation conversation, View view) {
+        if (!conversation.hasValidOtrSession() || conversation.getOtrSession().getSessionStatus() != SessionStatus.ENCRYPTED) {
+            Toast.makeText(this, R.string.otr_session_not_started, Toast.LENGTH_LONG).show();
+            return;
         }
-    }
-
-    private boolean selectConversationByUuid(String uuid) {
-        if (uuid == null) {
-            return false;
+        if (view == null) {
+            return;
         }
-        for (Conversation aConversationList : conversationList) {
-            if (aConversationList.getUuid().equals(uuid)) {
-                setSelectedConversation(aConversationList);
+        PopupMenu popup = new PopupMenu(this, view);
+        popup.inflate(R.menu.verification_choices);
+        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(MenuItem menuItem) {
+                Intent intent = new Intent(ConversationActivity.this, VerifyOTRActivity.class);
+                intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
+                intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
+                intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().toBareJid().toString());
+                switch (menuItem.getItemId()) {
+                    case R.id.scan_fingerprint:
+                        intent.putExtra("mode", VerifyOTRActivity.MODE_SCAN_FINGERPRINT);
+                        break;
+                    case R.id.ask_question:
+                        intent.putExtra("mode", VerifyOTRActivity.MODE_ASK_QUESTION);
+                        break;
+                    case R.id.manual_verification:
+                        intent.putExtra("mode", VerifyOTRActivity.MODE_MANUAL_VERIFICATION);
+                        break;
+                }
+                startActivity(intent);
                 return true;
             }
-        }
-        return false;
-    }
-
-    @Override
-    protected void unregisterListeners() {
-        super.unregisterListeners();
-        xmppConnectionService.getNotificationService().setOpenConversation(null);
+        });
+        popup.show();
     }
 
     @Override
-    protected void onActivityResult(final int requestCode, int resultCode, final Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != RESULT_OK) {
-            if (requestCode == REQUEST_BATTERY_OP) {
-                setNeverAskForBatteryOptimizationsAgain();
-            }
-        }
-    }
+    public void onConversationArchived(Conversation conversation) {
 
-    private String getBatteryOptimizationPreferenceKey() {
-        @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
-        return "show_battery_optimization" + (device == null ? "" : device);
     }
 
-    private void setNeverAskForBatteryOptimizationsAgain() {
-        getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
-    }
-
-    private void openBatteryOptimizationDialogIfNeeded() {
-        if (hasAccountWithoutPush()
-                && isOptimizingBattery()
-                && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle(R.string.battery_optimizations_enabled);
-            builder.setMessage(R.string.battery_optimizations_enabled_dialog);
-            builder.setPositiveButton(R.string.next, (dialog, which) -> {
-                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
-                Uri uri = Uri.parse("package:" + getPackageName());
-                intent.setData(uri);
-                try {
-                    startActivityForResult(intent, REQUEST_BATTERY_OP);
-                } catch (ActivityNotFoundException e) {
-                    Toast.makeText(ConversationActivity.this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
-                }
-            });
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
-                builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
-            }
-            builder.create().show();
-        }
-    }
-
-    private boolean hasAccountWithoutPush() {
-        for (Account account : xmppConnectionService.getAccounts()) {
-            if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public void updateConversationList() {
-        xmppConnectionService.populateWithOrderedConversations(conversationList);
-        if (!conversationList.contains(mSelectedConversation)) {
-            mSelectedConversation = null;
-        }
-        if (swipedConversation != null) {
-            if (swipedConversation.isRead()) {
-                conversationList.remove(swipedConversation);
-            }
+    @Override
+    public void onConversationsListItemUpdated() {
+        Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
+        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
+            ((ConversationsOverviewFragment) fragment).refresh();
         }
-        listAdapter.notifyDataSetChanged();
     }
 
     @Override
-    protected void refreshUiReal() {
-        updateConversationList();
-        if (conversationList.size() > 0) {
-            if (!this.mConversationFragment.isAdded()) {
-                Log.d(Config.LOGTAG, "fragment NOT added to activity. detached=" + Boolean.toString(mConversationFragment.isDetached()));
-            }
-            if (getSelectedConversation() == null) {
-                reInitLatestConversation();
-            } else {
-                ConversationActivity.this.mConversationFragment.refresh();
-                updateActionBarTitle();
-                invalidateOptionsMenu();
-            }
-        } else {
-            if (!isStopping() && mRedirected.compareAndSet(false, true)) {
-                redirectToStartConversationActivity(false);
-            }
-            Log.d(Config.LOGTAG, "not updating conversations fragment because conversations list size was 0");
-        }
+    public void onConversationRead(Conversation conversation) {
+        Log.d(Config.LOGTAG, "read event for " + conversation.getName() + " received");
     }
 
     @Override
@@ -970,32 +287,12 @@ public class ConversationActivity extends XmppActivity
     }
 
     @Override
-    public void OnUpdateBlocklist(Status status) {
+    public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
         this.refreshUi();
     }
 
     @Override
-    public void onShowErrorToast(final int resId) {
-        runOnUiThread(() -> Toast.makeText(ConversationActivity.this, resId, Toast.LENGTH_SHORT).show());
+    public void onShowErrorToast(int resId) {
+        runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
     }
-
-    public boolean highlightSelectedConversations() {
-        return !isConversationsOverviewHideable() || this.conversationWasSelectedByKeyboard;
-    }
-
-    @Override
-    public void onClick(View view) {
-        final Conversation conversation = getSelectedConversation();
-        if (conversation.getMode() == Conversation.MODE_SINGLE) {
-            switchToContactDetails(getSelectedConversation().getContact());
-        } else if (conversation.getMode() == Conversation.MODE_MULTI) {
-            Intent intent = new Intent(this,
-                    ConferenceDetailsActivity.class);
-            intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
-            intent.putExtra("uuid", getSelectedConversation().getUuid());
-            startActivity(intent);
-        }
-    }
-
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 37924a0ea..f5fc419a1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -148,7 +148,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     protected Message lastHistoryMessage = null;
     SimpleDateFormat sdf = new SimpleDateFormat("EEEE, dd. MMM yyyy", Locale.getDefault());
     private Toast messageLoaderToast;
-    private ConversationsMainActivity activity;
+    private ConversationActivity activity;
     protected OnClickListener clickToVerify = new OnClickListener() {
         @Override
         public void onClick(View v) {
@@ -968,9 +968,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
-        Log.d(Config.LOGTAG, "onAttach()");
-        if (activity instanceof ConversationsMainActivity) {
-            this.activity = (ConversationsMainActivity) activity;
+        Log.d(Config.LOGTAG, "ConversationFragment.onAttach()");
+        if (activity instanceof ConversationActivity) {
+            this.activity = (ConversationActivity) activity;
         } else {
             throw new IllegalStateException("Trying to attach fragment to activity that is not the ConversationActivity");
         }
@@ -1764,6 +1764,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
 
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
+        Log.d(Config.LOGTAG, "ConversationFragment.onActivityCreated()");
         super.onActivityCreated(savedInstanceState);
         if (savedInstanceState == null) {
             return;
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationLegacyActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationLegacyActivity.java
new file mode 100644
index 000000000..5c99ff001
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/ui/ConversationLegacyActivity.java
@@ -0,0 +1,1028 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package de.pixart.messenger.ui;
+
+import android.annotation.SuppressLint;
+import android.app.FragmentTransaction;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Typeface;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.provider.Settings;
+import android.support.v4.widget.SlidingPaneLayout;
+import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.util.Log;
+import android.util.Pair;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.Surface;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemClickListener;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.MucOptions;
+import de.pixart.messenger.entities.Presence;
+import de.pixart.messenger.services.EmojiService;
+import de.pixart.messenger.services.UpdateService;
+import de.pixart.messenger.services.XmppConnectionService;
+import de.pixart.messenger.services.XmppConnectionService.OnAccountUpdate;
+import de.pixart.messenger.services.XmppConnectionService.OnConversationUpdate;
+import de.pixart.messenger.services.XmppConnectionService.OnRosterUpdate;
+import de.pixart.messenger.ui.adapter.ConversationAdapter;
+import de.pixart.messenger.utils.UIHelper;
+import de.pixart.messenger.xmpp.OnUpdateBlocklist;
+import de.pixart.messenger.xmpp.chatstate.ChatState;
+import de.pixart.messenger.xmpp.jid.InvalidJidException;
+import de.pixart.messenger.xmpp.jid.Jid;
+
+import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
+
+public class ConversationLegacyActivity extends XmppActivity
+        implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast, View.OnClickListener {
+
+    public static final String ACTION_VIEW_CONVERSATION = "de.pixart.messenger.VIEW";
+    public static final String ACTION_DESTROY_MUC = "de.pixart.messenger.DESTROY_MUC";
+    public static final String CONVERSATION = "conversationUuid";
+    public static final String EXTRA_DOWNLOAD_UUID = "de.pixart.messenger.download_uuid";
+    public static final String TEXT = "text";
+    public static final String NICK = "nick";
+    public static final String PRIVATE_MESSAGE = "pm";
+
+    private static final String STATE_OPEN_CONVERSATION = "state_open_conversation";
+    private static final String STATE_PANEL_OPEN = "state_panel_open";
+    private static final String STATE_PENDING_IMAGE_URI = "state_pending_image_uri";
+    private static final String STATE_PENDING_PHOTO_URI = "state_pending_photo_uri";
+    private static final String STATE_FIRST_VISIBLE = "first_visible";
+    private static final String STATE_OFFSET_FROM_TOP = "offset_from_top";
+
+    private String mOpenConversation = null;
+    private boolean mPanelOpen = true;
+    private AtomicBoolean mShouldPanelBeOpen = new AtomicBoolean(false);
+    private Pair<Integer, Integer> mScrollPosition = null;
+    private boolean forbidProcessingPendings = false;
+
+    private boolean conversationWasSelectedByKeyboard = false;
+
+    private View mContentView;
+
+    private List<Conversation> conversationList = new ArrayList<>();
+    private Conversation swipedConversation = null;
+    private Conversation mSelectedConversation = null;
+    private ListView listView;
+    public ConversationFragment mConversationFragment;
+
+    private ArrayAdapter<Conversation> listAdapter;
+
+    private boolean mActivityPaused = false;
+    private AtomicBoolean mRedirected = new AtomicBoolean(false);
+    private boolean mUnprocessedNewIntent = false;
+    private boolean showLastSeen = false;
+
+    long FirstStartTime = -1;
+
+    String PREF_FIRST_START = "FirstStart";
+
+    public Conversation getSelectedConversation() {
+        return this.mSelectedConversation;
+    }
+
+    public void setSelectedConversation(Conversation conversation) {
+        this.mSelectedConversation = conversation;
+    }
+
+    public void showConversationsOverview() {
+        if (mConversationFragment != null) {
+            mConversationFragment.stopScrolling();
+            mConversationFragment.hideSearchField();
+        }
+        if (mContentView instanceof SlidingPaneLayout) {
+            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
+            mShouldPanelBeOpen.set(true);
+            mSlidingPaneLayout.openPane();
+        }
+    }
+
+    @Override
+    protected String getShareableUri() {
+        Conversation conversation = getSelectedConversation();
+        if (conversation != null) {
+            return conversation.getAccount().getShareableUri();
+        } else {
+            return "";
+        }
+    }
+
+    public void hideConversationsOverview() {
+        if (mContentView instanceof SlidingPaneLayout) {
+            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
+            mShouldPanelBeOpen.set(false);
+            mSlidingPaneLayout.closePane();
+        }
+    }
+
+    public boolean isConversationsOverviewHideable() {
+        if (mContentView instanceof SlidingPaneLayout) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    public boolean isConversationsOverviewVisable() {
+        if (mContentView instanceof SlidingPaneLayout) {
+            return mShouldPanelBeOpen.get();
+        } else {
+            return true;
+        }
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        new EmojiService(this).init(useBundledEmoji());
+        if (savedInstanceState != null) {
+            mOpenConversation = savedInstanceState.getString(STATE_OPEN_CONVERSATION, null);
+            mPanelOpen = savedInstanceState.getBoolean(STATE_PANEL_OPEN, true);
+            int pos = savedInstanceState.getInt(STATE_FIRST_VISIBLE, -1);
+            int offset = savedInstanceState.getInt(STATE_OFFSET_FROM_TOP, 1);
+            if (pos >= 0 && offset <= 0) {
+                Log.d(Config.LOGTAG, "retrieved scroll position from instanceState " + pos + ":" + offset);
+                mScrollPosition = new Pair<>(pos, offset);
+            } else {
+                mScrollPosition = null;
+            }
+        }
+
+        setContentView(R.layout.fragment_conversations_overview);
+
+        this.mConversationFragment = new ConversationFragment();
+        FragmentTransaction transaction = getFragmentManager().beginTransaction();
+        //transaction.replace(R.id.selected_conversation, this.mConversationFragment, "conversation");
+        transaction.commit();
+
+        listView = findViewById(R.id.list);
+        this.listAdapter = new ConversationAdapter(this, conversationList);
+        listView.setAdapter(this.listAdapter);
+
+        final ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE);
+        }
+
+        listView.setOnItemClickListener(new OnItemClickListener() {
+
+            @Override
+            public void onItemClick(AdapterView<?> arg0, View clickedView,
+                                    int position, long arg3) {
+                if (getSelectedConversation() != conversationList.get(position)) {
+                    ConversationLegacyActivity.this.mConversationFragment.stopScrolling();
+                    setSelectedConversation(conversationList.get(position));
+                    ConversationLegacyActivity.this.mConversationFragment.reInit(getSelectedConversation());
+                    conversationWasSelectedByKeyboard = false;
+                }
+                hideConversationsOverview();
+                openConversation();
+            }
+        });
+
+        //mContentView = findViewById(R.id.content_view_spl);
+        if (mContentView == null) {
+            //mContentView = findViewById(R.id.content_view_ll);
+        }
+        if (mContentView instanceof SlidingPaneLayout) {
+            SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
+            mSlidingPaneLayout.setShadowResourceLeft(R.drawable.es_slidingpane_shadow);
+            mSlidingPaneLayout.setSliderFadeColor(0);
+            mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
+
+                @Override
+                public void onPanelOpened(View arg0) {
+                    mShouldPanelBeOpen.set(true);
+                    updateActionBarTitle();
+                    invalidateOptionsMenu();
+                    hideKeyboard();
+                    if (xmppConnectionServiceBound) {
+                        xmppConnectionService.getNotificationService().setOpenConversation(null);
+                    }
+                    closeContextMenu();
+                    mConversationFragment.hideSearchField();
+                }
+
+                @Override
+                public void onPanelClosed(View arg0) {
+                    mShouldPanelBeOpen.set(false);
+                    openConversation();
+                }
+
+                @Override
+                public void onPanelSlide(View arg0, float arg1) {
+                    // TODO Auto-generated method stub
+
+                }
+            });
+        }
+    }
+
+    public boolean useBundledEmoji() {
+        return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
+    }
+
+    private boolean isPackageInstalled(String targetPackage) {
+        List<ApplicationInfo> packages;
+        PackageManager pm;
+        pm = getPackageManager();
+        packages = pm.getInstalledApplications(0);
+        for (ApplicationInfo packageInfo : packages) {
+            if (packageInfo.packageName.equals(targetPackage)) return true;
+        }
+        return false;
+    }
+
+    protected void AppUpdate(boolean PlayStore) {
+        if (PlayStore) {
+            return;
+        }
+        String PREFS_NAME = "UpdateTimeStamp";
+        SharedPreferences UpdateTimeStamp = getApplicationContext().getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
+        long lastUpdateTime = UpdateTimeStamp.getLong("lastUpdateTime", 0);
+        Log.d(Config.LOGTAG, "AppUpdater: LastUpdateTime: " + lastUpdateTime);
+        if ((lastUpdateTime + (Config.UPDATE_CHECK_TIMER * 1000)) < System.currentTimeMillis()) {
+            lastUpdateTime = System.currentTimeMillis();
+            SharedPreferences.Editor editor = UpdateTimeStamp.edit();
+            editor.putLong("lastUpdateTime", lastUpdateTime);
+            editor.apply();
+            Log.d(Config.LOGTAG, "AppUpdater: CurrentTime: " + lastUpdateTime);
+            if (!installFromUnknownSourceAllowed() && !PlayStore) {
+                openInstallFromUnknownSourcesDialogIfNeeded();
+            } else {
+                UpdateService task = new UpdateService(this, PlayStore);
+                task.executeOnExecutor(UpdateService.THREAD_POOL_EXECUTOR, "false");
+                Log.d(Config.LOGTAG, "AppUpdater started");
+            }
+        } else {
+            Log.d(Config.LOGTAG, "AppUpdater stopped");
+            return;
+        }
+    }
+
+    @Override
+    public void switchToConversation(Conversation conversation) {
+        setSelectedConversation(conversation);
+        runOnUiThread(() -> {
+            ConversationLegacyActivity.this.mConversationFragment.reInit(getSelectedConversation());
+            openConversation();
+        });
+    }
+
+    private void updateActionBarTitle() {
+        updateActionBarTitle(isConversationsOverviewHideable() && !isConversationsOverviewVisable());
+    }
+
+    private void updateActionBarTitle(boolean titleShouldBeName) {
+        final ActionBar ab = getSupportActionBar();
+        final Conversation conversation = getSelectedConversation();
+        if (ab != null) {
+            if (titleShouldBeName && conversation != null) {
+                if ((ab.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) != ActionBar.DISPLAY_HOME_AS_UP) {
+                    ab.setDisplayOptions(ActionBar.DISPLAY_HOME_AS_UP | ActionBar.DISPLAY_SHOW_TITLE);
+                }
+                ab.setDisplayShowTitleEnabled(false);
+                ab.setDisplayShowCustomEnabled(true);
+                ab.setCustomView(R.layout.ab_title);
+                TextView abtitle = findViewById(android.R.id.text1);
+                TextView absubtitle = findViewById(android.R.id.text2);
+                abtitle.setText(conversation.getName());
+                abtitle.setOnClickListener(this);
+                abtitle.setSelected(true);
+                if (conversation.getMode() == Conversation.MODE_SINGLE && !this.getSelectedConversation().withSelf()) {
+                    ChatState state = conversation.getIncomingChatState();
+                    if (conversation.getContact().getShownStatus() == Presence.Status.OFFLINE) {
+                        absubtitle.setText(getString(R.string.account_status_offline));
+                        absubtitle.setSelected(true);
+                        absubtitle.setOnClickListener(this);
+                    } else {
+                        if (state == ChatState.COMPOSING) {
+                            absubtitle.setText(getString(R.string.is_typing));
+                            absubtitle.setTypeface(null, Typeface.BOLD_ITALIC);
+                            absubtitle.setSelected(true);
+                            absubtitle.setOnClickListener(this);
+                        } else {
+                            if (showLastSeen && conversation.getContact().getLastseen() > 0) {
+                                absubtitle.setText(UIHelper.lastseen(getApplicationContext(), conversation.getContact().isActive(), conversation.getContact().getLastseen()));
+                            } else {
+                                absubtitle.setText(getString(R.string.account_status_online));
+                            }
+                            absubtitle.setSelected(true);
+                            absubtitle.setOnClickListener(this);
+                        }
+                    }
+                } else {
+                    if (conversation.getParticipants() != null) {
+                        ChatState state = ChatState.COMPOSING;
+                        List<MucOptions.User> userWithChatStates = conversation.getMucOptions().getUsersWithChatState(state, 5);
+                        if (userWithChatStates.size() == 0) {
+                            state = ChatState.PAUSED;
+                            userWithChatStates = conversation.getMucOptions().getUsersWithChatState(state, 5);
+                        }
+                        List<MucOptions.User> users = conversation.getMucOptions().getUsers(true);
+                        if (state == ChatState.COMPOSING) {
+                            if (userWithChatStates.size() > 0) {
+                                if (userWithChatStates.size() == 1) {
+                                    MucOptions.User user = userWithChatStates.get(0);
+                                    absubtitle.setText(getString(R.string.contact_is_typing, UIHelper.getDisplayName(user)));
+                                } else {
+                                    StringBuilder builder = new StringBuilder();
+                                    for (MucOptions.User user : userWithChatStates) {
+                                        if (builder.length() != 0) {
+                                            builder.append(", ");
+                                        }
+                                        builder.append(UIHelper.getDisplayName(user));
+                                    }
+                                    absubtitle.setText(getString(R.string.contacts_are_typing, builder.toString()));
+                                }
+                            }
+                        } else {
+                            if (users.size() == 1) {
+                                absubtitle.setText(getString(R.string.one_participant));
+                            } else {
+                                absubtitle.setText(getString(R.string.more_participants, users.size()));
+                            }
+                        }
+                        absubtitle.setSelected(true);
+                        absubtitle.setOnClickListener(this);
+                    } else {
+                        absubtitle.setText(R.string.no_participants);
+                        abtitle.setSelected(true);
+                        absubtitle.setOnClickListener(this);
+                    }
+                }
+
+            } else {
+                if ((ab.getDisplayOptions() & ActionBar.DISPLAY_HOME_AS_UP) == ActionBar.DISPLAY_HOME_AS_UP) {
+                    ab.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE);
+                }
+                ab.setDisplayShowTitleEnabled(true);
+                ab.setDisplayShowCustomEnabled(false);
+                ab.setTitle(R.string.app_name);
+                ab.setSubtitle(null);
+            }
+        }
+    }
+
+    private void openConversation() {
+        this.updateActionBarTitle();
+        this.invalidateOptionsMenu();
+        if (xmppConnectionServiceBound) {
+            final Conversation conversation = getSelectedConversation();
+            xmppConnectionService.getNotificationService().setOpenConversation(conversation);
+            sendReadMarkerIfNecessary(conversation);
+        }
+        listAdapter.notifyDataSetChanged();
+    }
+
+    public void sendReadMarkerIfNecessary(final Conversation conversation) {
+        if (!mActivityPaused && !mUnprocessedNewIntent && conversation != null) {
+            xmppConnectionService.sendReadMarker(conversation);
+        }
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(final MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            showConversationsOverview();
+            return true;
+        } else if (item.getItemId() == R.id.action_add) {
+            startActivity(new Intent(this, StartConversationActivity.class));
+            return true;
+        } else {
+            return super.onOptionsItemSelected(item);
+        }
+    }
+
+    public void endConversation(Conversation conversation) {
+        endConversation(conversation, true, true);
+    }
+
+    public void endConversation(Conversation conversation, boolean showOverview, boolean reinit) {
+        if (showOverview) {
+            showConversationsOverview();
+        }
+        xmppConnectionService.archiveConversation(conversation);
+        if (reinit) {
+            if (conversationList.size() > 0) {
+                setSelectedConversation(conversationList.get(0));
+                this.mConversationFragment.reInit(getSelectedConversation());
+            } else {
+                setSelectedConversation(null);
+                if (mRedirected.compareAndSet(false, true)) {
+                    Intent intent = new Intent(this, StartConversationActivity.class);
+                    intent.putExtra("init", true);
+                    startActivity(intent);
+                    finish();
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (!isConversationsOverviewVisable() && mConversationFragment.isSearchFieldVisible()) {
+            mConversationFragment.hideSearchField();
+        } else if (!isConversationsOverviewVisable()) {
+            showConversationsOverview();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
+    @Override
+    public boolean onKeyUp(int key, KeyEvent event) {
+        int rotation = getWindowManager().getDefaultDisplay().getRotation();
+        final int upKey;
+        final int downKey;
+        switch (rotation) {
+            case Surface.ROTATION_90:
+                upKey = KeyEvent.KEYCODE_DPAD_LEFT;
+                downKey = KeyEvent.KEYCODE_DPAD_RIGHT;
+                break;
+            case Surface.ROTATION_180:
+                upKey = KeyEvent.KEYCODE_DPAD_DOWN;
+                downKey = KeyEvent.KEYCODE_DPAD_UP;
+                break;
+            case Surface.ROTATION_270:
+                upKey = KeyEvent.KEYCODE_DPAD_RIGHT;
+                downKey = KeyEvent.KEYCODE_DPAD_LEFT;
+                break;
+            case Surface.ROTATION_0:
+            default:
+                upKey = KeyEvent.KEYCODE_DPAD_UP;
+                downKey = KeyEvent.KEYCODE_DPAD_DOWN;
+        }
+        final boolean modifier = event.isCtrlPressed() || (event.getMetaState() & KeyEvent.META_ALT_LEFT_ON) != 0;
+        if (modifier && key == KeyEvent.KEYCODE_TAB && isConversationsOverviewHideable()) {
+            toggleConversationsOverview();
+            return true;
+        } else if (modifier && key == KeyEvent.KEYCODE_SPACE) {
+            startActivity(new Intent(this, StartConversationActivity.class));
+            return true;
+        } else if (modifier && key == downKey) {
+            if (isConversationsOverviewHideable() && !isConversationsOverviewVisable()) {
+                showConversationsOverview();
+            }
+            return selectDownConversation();
+        } else if (modifier && key == upKey) {
+            if (isConversationsOverviewHideable() && !isConversationsOverviewVisable()) {
+                showConversationsOverview();
+            }
+            return selectUpConversation();
+        } else if (modifier && key == KeyEvent.KEYCODE_1) {
+            return openConversationByIndex(0);
+        } else if (modifier && key == KeyEvent.KEYCODE_2) {
+            return openConversationByIndex(1);
+        } else if (modifier && key == KeyEvent.KEYCODE_3) {
+            return openConversationByIndex(2);
+        } else if (modifier && key == KeyEvent.KEYCODE_4) {
+            return openConversationByIndex(3);
+        } else if (modifier && key == KeyEvent.KEYCODE_5) {
+            return openConversationByIndex(4);
+        } else if (modifier && key == KeyEvent.KEYCODE_6) {
+            return openConversationByIndex(5);
+        } else if (modifier && key == KeyEvent.KEYCODE_7) {
+            return openConversationByIndex(6);
+        } else if (modifier && key == KeyEvent.KEYCODE_8) {
+            return openConversationByIndex(7);
+        } else if (modifier && key == KeyEvent.KEYCODE_9) {
+            return openConversationByIndex(8);
+        } else if (modifier && key == KeyEvent.KEYCODE_0) {
+            return openConversationByIndex(9);
+        } else {
+            return super.onKeyUp(key, event);
+        }
+    }
+
+    private void toggleConversationsOverview() {
+        if (isConversationsOverviewVisable()) {
+            hideConversationsOverview();
+            if (mConversationFragment != null) {
+                mConversationFragment.setFocusOnInputField();
+            }
+        } else {
+            showConversationsOverview();
+        }
+    }
+
+    private boolean selectUpConversation() {
+        if (this.mSelectedConversation != null) {
+            int index = this.conversationList.indexOf(this.mSelectedConversation);
+            if (index > 0) {
+                return openConversationByIndex(index - 1);
+            }
+        }
+        return false;
+    }
+
+    private boolean selectDownConversation() {
+        if (this.mSelectedConversation != null) {
+            int index = this.conversationList.indexOf(this.mSelectedConversation);
+            if (index != -1 && index < this.conversationList.size() - 1) {
+                return openConversationByIndex(index + 1);
+            }
+        }
+        return false;
+    }
+
+    private boolean openConversationByIndex(int index) {
+        try {
+            this.conversationWasSelectedByKeyboard = true;
+            this.mConversationFragment.stopScrolling();
+            setSelectedConversation(this.conversationList.get(index));
+            this.mConversationFragment.reInit(getSelectedConversation());
+            if (index > listView.getLastVisiblePosition() - 1 || index < listView.getFirstVisiblePosition() + 1) {
+                this.listView.setSelection(index);
+            }
+            openConversation();
+            return true;
+        } catch (IndexOutOfBoundsException e) {
+            return false;
+        }
+    }
+
+    @Override
+    protected void onNewIntent(final Intent intent) {
+        if (intent != null && ACTION_VIEW_CONVERSATION.equals(intent.getAction())) {
+            mOpenConversation = null;
+            mUnprocessedNewIntent = true;
+            if (xmppConnectionServiceBound) {
+                handleViewConversationIntent(intent);
+                intent.setAction(Intent.ACTION_MAIN);
+            } else {
+                setIntent(intent);
+            }
+        } else if (intent != null && ACTION_DESTROY_MUC.equals(intent.getAction())) {
+            final Bundle extras = intent.getExtras();
+            if (extras != null && extras.containsKey("MUC_UUID")) {
+                Log.d(Config.LOGTAG, "Get " + intent.getAction() + " intent for " + extras.getString("MUC_UUID"));
+                Conversation conversation = xmppConnectionService.findConversationByUuid(extras.getString("MUC_UUID"));
+                ConversationLegacyActivity.this.xmppConnectionService.clearConversationHistory(conversation);
+                xmppConnectionService.destroyMuc(conversation);
+                endConversation(conversation);
+            }
+        }
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        this.mRedirected.set(false);
+        if (this.xmppConnectionServiceBound) {
+            this.onBackendConnected();
+        }
+        if (conversationList.size() >= 1) {
+            this.onConversationUpdate();
+        }
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+        this.showLastSeen = preferences.getBoolean("last_activity", false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        this.mActivityPaused = true;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        final int theme = findTheme();
+        final boolean usingEnterKey = usingEnterKey();
+        if (this.mTheme != theme || usingEnterKey != mUsingEnterKey) {
+            recreate();
+        }
+        this.mActivityPaused = false;
+        if (!isConversationsOverviewVisable() || !isConversationsOverviewHideable()) {
+            sendReadMarkerIfNecessary(getSelectedConversation());
+        }
+    }
+
+    @Override
+    public void onSaveInstanceState(final Bundle savedInstanceState) {
+        Conversation conversation = getSelectedConversation();
+        if (conversation != null) {
+            savedInstanceState.putString(STATE_OPEN_CONVERSATION, conversation.getUuid());
+            Pair<Integer, Integer> scrollPosition = mConversationFragment.getScrollPosition();
+            if (scrollPosition != null) {
+                savedInstanceState.putInt(STATE_FIRST_VISIBLE, scrollPosition.first);
+                savedInstanceState.putInt(STATE_OFFSET_FROM_TOP, scrollPosition.second);
+            }
+        } else {
+            savedInstanceState.remove(STATE_OPEN_CONVERSATION);
+        }
+        savedInstanceState.putBoolean(STATE_PANEL_OPEN, isConversationsOverviewVisable());
+        /*if (this.mPendingImageUris.size() >= 1) {
+            Log.d(Config.LOGTAG, "ConversationActivity.onSaveInstanceState() - saving pending image uri");
+            savedInstanceState.putString(STATE_PENDING_IMAGE_URI, this.mPendingImageUris.get(0).toString());
+        } else if (this.mPendingPhotoUris.size() >= 1) {
+            savedInstanceState.putString(STATE_PENDING_PHOTO_URI, this.mPendingPhotoUris.get(0).toString());
+        } else {
+            savedInstanceState.remove(STATE_PENDING_IMAGE_URI);
+            savedInstanceState.remove(STATE_PENDING_PHOTO_URI);
+        }*/
+        super.onSaveInstanceState(savedInstanceState);
+    }
+
+    private void clearPending() {
+        mConversationFragment.clearPending();
+    }
+
+    private void redirectToStartConversationActivity(boolean noAnimation) {
+        Account pendingAccount = xmppConnectionService.getPendingAccount();
+        if (pendingAccount == null) {
+            Intent startConversationActivity = new Intent(this, StartConversationActivity.class);
+            startConversationActivity.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            if (noAnimation) {
+                startConversationActivity.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
+            }
+            startConversationActivity.putExtra("init", true);
+            startActivity(startConversationActivity);
+            if (noAnimation) {
+                overridePendingTransition(0, 0);
+            }
+        } else {
+            switchToAccount(pendingAccount, true);
+        }
+    }
+
+    @Override
+    void onBackendConnected() {
+        this.xmppConnectionService.getNotificationService().setIsInForeground(true);
+        updateConversationList();
+        final Intent intent = getIntent();
+        final Bundle extras = intent.getExtras();
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (extras != null && extras.containsKey(PREF_FIRST_START)) {
+                FirstStartTime = extras.getLong(PREF_FIRST_START);
+                Log.d(Config.LOGTAG, "Get first start time from StartUI: " + FirstStartTime);
+            }
+        } else {
+            FirstStartTime = System.currentTimeMillis();
+            Log.d(Config.LOGTAG, "Device is running Android < SDK 23, no restart required: " + FirstStartTime);
+        }
+
+        if (mPendingConferenceInvite != null) {
+            if (mPendingConferenceInvite.execute(this)) {
+                mToast = Toast.makeText(this, R.string.creating_conference, Toast.LENGTH_LONG);
+                mToast.show();
+            }
+            mPendingConferenceInvite = null;
+        }
+
+        if (FirstStartTime == 0) {
+            Log.d(Config.LOGTAG, "First start time: " + FirstStartTime + ", restarting App");
+            //write first start timestamp to file
+            FirstStartTime = System.currentTimeMillis();
+            SharedPreferences FirstStart = getApplicationContext().getSharedPreferences(PREF_FIRST_START, Context.MODE_PRIVATE);
+            SharedPreferences.Editor editor = FirstStart.edit();
+            editor.putLong(PREF_FIRST_START, FirstStartTime);
+            editor.commit();
+            // restart
+            Intent restartintent = getBaseContext().getPackageManager().getLaunchIntentForPackage(getBaseContext().getPackageName());
+            restartintent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            restartintent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(restartintent);
+            System.exit(0);
+        }
+
+        if (xmppConnectionService.getAccounts().size() == 0) {
+            if (mRedirected.compareAndSet(false, true)) {
+                if (Config.X509_VERIFICATION) {
+                    Intent redirectionIntent = new Intent(this, ManageAccountActivity.class);
+                    redirectionIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                    startActivity(redirectionIntent);
+                    overridePendingTransition(0, 0);
+                } else if (Config.MAGIC_CREATE_DOMAIN != null) {
+                    WelcomeActivity.launch(this);
+                } else {
+                    Intent editAccount = new Intent(this, EditAccountActivity.class);
+                    editAccount.putExtra("init", true);
+                    editAccount.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+                    startActivity(editAccount);
+                    overridePendingTransition(0, 0);
+                }
+            }
+        } else if (conversationList.size() <= 0) {
+            if (mRedirected.compareAndSet(false, true)) {
+                redirectToStartConversationActivity(true);
+            }
+        } else if (selectConversationByUuid(mOpenConversation)) {
+            if (mPanelOpen) {
+                showConversationsOverview();
+            } else {
+                if (isConversationsOverviewHideable()) {
+                    openConversation();
+                    updateActionBarTitle(true);
+                }
+            }
+            if (this.mConversationFragment.reInit(getSelectedConversation())) {
+                Log.d(Config.LOGTAG, "setting scroll position on fragment");
+                this.mConversationFragment.setScrollPosition(mScrollPosition);
+            }
+            mOpenConversation = null;
+        } else if (intent != null && ACTION_VIEW_CONVERSATION.equals(intent.getAction())) {
+            clearPending();
+            handleViewConversationIntent(intent);
+            intent.setAction(Intent.ACTION_MAIN);
+        } else if (getSelectedConversation() == null) {
+            reInitLatestConversation();
+        } else {
+            this.mConversationFragment.messageListAdapter.updatePreferences();
+            //this.mConversationFragment.messagesView.invalidateViews();
+            this.mConversationFragment.setupIme();
+        }
+
+        if (xmppConnectionService.getAccounts().size() != 0) {
+            if (xmppConnectionService.hasInternetConnection()) {
+                if (xmppConnectionService.isWIFI() || (xmppConnectionService.isMobile() && !xmppConnectionService.isMobileRoaming())) {
+                    if (!xmppConnectionService.installedFromFDroid()) {
+                        AppUpdate(xmppConnectionService.installedFromPlayStore());
+                    }
+                }
+            }
+        }
+
+        mConversationFragment.onBackendConnected();
+
+        /*if (!ExceptionHelper.checkForCrash(this, this.xmppConnectionService) && !mRedirected.get()) {
+            openBatteryOptimizationDialogIfNeeded();
+        }*/
+
+        if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
+            xmppConnectionService.getNotificationService().setOpenConversation(null);
+        } else {
+            xmppConnectionService.getNotificationService().setOpenConversation(getSelectedConversation());
+        }
+    }
+
+    private boolean isStopping() {
+        if (Build.VERSION.SDK_INT >= 17) {
+            return isFinishing() || isDestroyed();
+        } else {
+            return isFinishing();
+        }
+    }
+
+    private void reInitLatestConversation() {
+        showConversationsOverview();
+        clearPending();
+        setSelectedConversation(conversationList.get(0));
+        this.mConversationFragment.reInit(getSelectedConversation());
+    }
+
+    private void handleViewConversationIntent(final Intent intent) {
+        final String uuid = intent.getStringExtra(CONVERSATION);
+        final String downloadUuid = intent.getStringExtra(EXTRA_DOWNLOAD_UUID);
+        final String text = intent.getStringExtra(TEXT);
+        final String nick = intent.getStringExtra(NICK);
+        final boolean pm = intent.getBooleanExtra(PRIVATE_MESSAGE, false);
+        this.mConversationFragment.stopScrolling();
+        if (selectConversationByUuid(uuid)) {
+            this.mConversationFragment.reInit(getSelectedConversation());
+            if (nick != null) {
+                if (pm) {
+                    Jid jid = getSelectedConversation().getJid();
+                    try {
+                        Jid next = Jid.fromParts(jid.getLocalpart(), jid.getDomainpart(), nick);
+                        this.mConversationFragment.privateMessageWith(next);
+                    } catch (final InvalidJidException ignored) {
+                        //do nothing
+                    }
+                } else {
+                    this.mConversationFragment.highlightInConference(nick);
+                }
+            } else {
+                this.mConversationFragment.appendText(text);
+            }
+            hideConversationsOverview();
+            mUnprocessedNewIntent = false;
+            openConversation();
+            if (mContentView instanceof SlidingPaneLayout) {
+                updateActionBarTitle(true); //fixes bug where slp isn't properly closed yet
+            }
+            if (downloadUuid != null) {
+                final Message message = mSelectedConversation.findMessageWithFileAndUuid(downloadUuid);
+                if (message != null) {
+                    //startDownloadable(message);
+                }
+            }
+        } else {
+            mUnprocessedNewIntent = false;
+
+        }
+    }
+
+    private boolean selectConversationByUuid(String uuid) {
+        if (uuid == null) {
+            return false;
+        }
+        for (Conversation aConversationList : conversationList) {
+            if (aConversationList.getUuid().equals(uuid)) {
+                setSelectedConversation(aConversationList);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    protected void unregisterListeners() {
+        super.unregisterListeners();
+        xmppConnectionService.getNotificationService().setOpenConversation(null);
+    }
+
+    @Override
+    protected void onActivityResult(final int requestCode, int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (resultCode != RESULT_OK) {
+            if (requestCode == REQUEST_BATTERY_OP) {
+                setNeverAskForBatteryOptimizationsAgain();
+            }
+        }
+    }
+
+    private String getBatteryOptimizationPreferenceKey() {
+        @SuppressLint("HardwareIds") String device = Settings.Secure.getString(getContentResolver(), Settings.Secure.ANDROID_ID);
+        return "show_battery_optimization" + (device == null ? "" : device);
+    }
+
+    private void setNeverAskForBatteryOptimizationsAgain() {
+        getPreferences().edit().putBoolean(getBatteryOptimizationPreferenceKey(), false).apply();
+    }
+
+    private void openBatteryOptimizationDialogIfNeeded() {
+        if (hasAccountWithoutPush()
+                && isOptimizingBattery()
+                && getPreferences().getBoolean(getBatteryOptimizationPreferenceKey(), true)) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle(R.string.battery_optimizations_enabled);
+            builder.setMessage(R.string.battery_optimizations_enabled_dialog);
+            builder.setPositiveButton(R.string.next, (dialog, which) -> {
+                Intent intent = new Intent(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                Uri uri = Uri.parse("package:" + getPackageName());
+                intent.setData(uri);
+                try {
+                    startActivityForResult(intent, REQUEST_BATTERY_OP);
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(this, R.string.device_does_not_support_battery_op, Toast.LENGTH_SHORT).show();
+                }
+            });
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR2) {
+                builder.setOnDismissListener(dialog -> setNeverAskForBatteryOptimizationsAgain());
+            }
+            builder.create().show();
+        }
+    }
+
+    private boolean hasAccountWithoutPush() {
+        for (Account account : xmppConnectionService.getAccounts()) {
+            if (account.getStatus() == Account.State.ONLINE && !xmppConnectionService.getPushManagementService().available(account)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void updateConversationList() {
+        xmppConnectionService.populateWithOrderedConversations(conversationList);
+        if (!conversationList.contains(mSelectedConversation)) {
+            mSelectedConversation = null;
+        }
+        if (swipedConversation != null) {
+            if (swipedConversation.isRead()) {
+                conversationList.remove(swipedConversation);
+            }
+        }
+        listAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    protected void refreshUiReal() {
+        updateConversationList();
+        if (conversationList.size() > 0) {
+            if (!this.mConversationFragment.isAdded()) {
+                Log.d(Config.LOGTAG, "fragment NOT added to activity. detached=" + Boolean.toString(mConversationFragment.isDetached()));
+            }
+            if (getSelectedConversation() == null) {
+                reInitLatestConversation();
+            } else {
+                ConversationLegacyActivity.this.mConversationFragment.refresh();
+                updateActionBarTitle();
+                invalidateOptionsMenu();
+            }
+        } else {
+            if (!isStopping() && mRedirected.compareAndSet(false, true)) {
+                redirectToStartConversationActivity(false);
+            }
+            Log.d(Config.LOGTAG, "not updating conversations fragment because conversations list size was 0");
+        }
+    }
+
+    @Override
+    public void onAccountUpdate() {
+        this.refreshUi();
+    }
+
+    @Override
+    public void onConversationUpdate() {
+        this.refreshUi();
+    }
+
+    @Override
+    public void onRosterUpdate() {
+        this.refreshUi();
+    }
+
+    @Override
+    public void OnUpdateBlocklist(Status status) {
+        this.refreshUi();
+    }
+
+    @Override
+    public void onShowErrorToast(final int resId) {
+        runOnUiThread(() -> Toast.makeText(ConversationLegacyActivity.this, resId, Toast.LENGTH_SHORT).show());
+    }
+
+    public boolean highlightSelectedConversations() {
+        return !isConversationsOverviewHideable() || this.conversationWasSelectedByKeyboard;
+    }
+
+    @Override
+    public void onClick(View view) {
+        final Conversation conversation = getSelectedConversation();
+        if (conversation.getMode() == Conversation.MODE_SINGLE) {
+            switchToContactDetails(getSelectedConversation().getContact());
+        } else if (conversation.getMode() == Conversation.MODE_MULTI) {
+            Intent intent = new Intent(this,
+                    ConferenceDetailsActivity.class);
+            intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
+            intent.putExtra("uuid", getSelectedConversation().getUuid());
+            startActivity(intent);
+        }
+    }
+
+
+}
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java b/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java
index 57b2e8948..e69de29bb 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationsMainActivity.java
@@ -1,292 +0,0 @@
-/*
- * Copyright (c) 2018, Daniel Gultsch All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation and/or
- * other materials provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors
- * may be used to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
- * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-package de.pixart.messenger.ui;
-
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.content.Intent;
-import android.databinding.DataBindingUtil;
-import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.v7.app.ActionBar;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.PopupMenu;
-import android.widget.Toast;
-
-import net.java.otr4j.session.SessionStatus;
-
-import de.pixart.messenger.Config;
-import de.pixart.messenger.R;
-import de.pixart.messenger.databinding.ActivityConversationsBinding;
-import de.pixart.messenger.entities.Conversation;
-import de.pixart.messenger.services.EmojiService;
-import de.pixart.messenger.services.XmppConnectionService;
-import de.pixart.messenger.ui.interfaces.OnConversationArchived;
-import de.pixart.messenger.ui.interfaces.OnConversationRead;
-import de.pixart.messenger.ui.interfaces.OnConversationSelected;
-import de.pixart.messenger.ui.interfaces.OnConversationsListItemUpdated;
-import de.pixart.messenger.xmpp.OnUpdateBlocklist;
-
-import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
-
-public class ConversationsMainActivity extends XmppActivity implements OnConversationSelected, OnConversationArchived, OnConversationsListItemUpdated, OnConversationRead, XmppConnectionService.OnAccountUpdate, XmppConnectionService.OnConversationUpdate, XmppConnectionService.OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
-
-
-    //secondary fragment (when holding the conversation, must be initialized before refreshing the overview fragment
-    private static final @IdRes
-    int[] FRAGMENT_ID_NOTIFICATION_ORDER = {R.id.secondary_fragment, R.id.main_fragment};
-
-    private ActivityConversationsBinding binding;
-
-    @Override
-    protected void refreshUiReal() {
-        for(@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
-            refreshFragment(id);
-        }
-    }
-
-    @Override
-    void onBackendConnected() {
-        for (@IdRes int id : FRAGMENT_ID_NOTIFICATION_ORDER) {
-            notifyFragmentOfBackendConnected(id);
-        }
-        invalidateActionBarTitle();
-    }
-
-    private void notifyFragmentOfBackendConnected(@IdRes int id) {
-        final Fragment fragment = getFragmentManager().findFragmentById(id);
-        if (fragment != null && fragment instanceof XmppFragment) {
-            ((XmppFragment) fragment).onBackendConnected();
-        }
-    }
-
-    private void refreshFragment(@IdRes int id) {
-        final Fragment fragment = getFragmentManager().findFragmentById(id);
-        if (fragment != null && fragment instanceof XmppFragment) {
-            ((XmppFragment) fragment).refresh();
-        }
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        new EmojiService(this).init(useBundledEmoji());
-        this.binding = DataBindingUtil.setContentView(this, R.layout.activity_conversations);
-        this.getFragmentManager().addOnBackStackChangedListener(this::invalidateActionBarTitle);
-        this.initializeFragments();
-        this.invalidateActionBarTitle();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(R.menu.activity_conversations, menu);
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public void onConversationSelected(Conversation conversation) {
-        Log.d(Config.LOGTAG, "selected " + conversation.getName());
-        ConversationFragment conversationFragment = (ConversationFragment) getFragmentManager().findFragmentById(R.id.secondary_fragment);
-        final boolean mainNeedsRefresh;
-        if (conversationFragment == null) {
-            mainNeedsRefresh = false;
-            conversationFragment = new ConversationFragment();
-            FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-            fragmentTransaction.replace(R.id.main_fragment, conversationFragment);
-            fragmentTransaction.addToBackStack(null);
-            fragmentTransaction.commit();
-        } else {
-            mainNeedsRefresh = true;
-        }
-        conversationFragment.reInit(conversation);
-        if (mainNeedsRefresh) {
-            refreshFragment(R.id.main_fragment);
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                FragmentManager fm = getFragmentManager();
-                if (fm.getBackStackEntryCount() > 0) {
-                    fm.popBackStack();
-                    return true;
-                }
-                break;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
-    private void initializeFragments() {
-        FragmentTransaction transaction = getFragmentManager().beginTransaction();
-        Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-        Fragment secondaryFragment = getFragmentManager().findFragmentById(R.id.secondary_fragment);
-        if (mainFragment != null) {
-            Log.d(Config.LOGTAG, "initializeFragment(). main fragment exists");
-            if (binding.secondaryFragment != null) {
-                if (mainFragment instanceof ConversationFragment) {
-                    Log.d(Config.LOGTAG, "gained secondary fragment. moving...");
-                    getFragmentManager().popBackStack();
-                    transaction.remove(mainFragment);
-                    transaction.commit();
-                    getFragmentManager().executePendingTransactions();
-                    transaction = getFragmentManager().beginTransaction();
-                    transaction.replace(R.id.secondary_fragment, mainFragment);
-                    transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
-                    transaction.commit();
-                    return;
-                }
-            } else {
-                if (secondaryFragment != null && secondaryFragment instanceof ConversationFragment) {
-                    Log.d(Config.LOGTAG, "lost secondary fragment. moving...");
-                    transaction.remove(secondaryFragment);
-                    transaction.commit();
-                    getFragmentManager().executePendingTransactions();
-                    transaction = getFragmentManager().beginTransaction();
-                    transaction.replace(R.id.main_fragment, secondaryFragment);
-                    transaction.addToBackStack(null);
-                    transaction.commit();
-                    return;
-                }
-            }
-        } else {
-            transaction.replace(R.id.main_fragment, new ConversationsOverviewFragment());
-        }
-
-        if (binding.secondaryFragment != null) {
-            transaction.replace(R.id.secondary_fragment, new ConversationFragment());
-        }
-        transaction.commit();
-    }
-
-    private void invalidateActionBarTitle() {
-        final ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            Fragment mainFragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-            if (mainFragment != null && mainFragment instanceof ConversationFragment) {
-                final Conversation conversation = ((ConversationFragment) mainFragment).getConversation();
-                if (conversation != null) {
-                    actionBar.setTitle(conversation.getName());
-                    actionBar.setDisplayHomeAsUpEnabled(true);
-                    return;
-                }
-            }
-            actionBar.setTitle(R.string.app_name);
-            actionBar.setDisplayHomeAsUpEnabled(false);
-        }
-    }
-
-    public boolean useBundledEmoji() {
-        return getPreferences().getBoolean(USE_BUNDLED_EMOJIS, getResources().getBoolean(R.bool.use_bundled_emoji));
-    }
-
-    public void verifyOtrSessionDialog(final Conversation conversation, View view) {
-        if (!conversation.hasValidOtrSession() || conversation.getOtrSession().getSessionStatus() != SessionStatus.ENCRYPTED) {
-            Toast.makeText(this, R.string.otr_session_not_started, Toast.LENGTH_LONG).show();
-            return;
-        }
-        if (view == null) {
-            return;
-        }
-        PopupMenu popup = new PopupMenu(this, view);
-        popup.inflate(R.menu.verification_choices);
-        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
-            @Override
-            public boolean onMenuItemClick(MenuItem menuItem) {
-                Intent intent = new Intent(ConversationsMainActivity.this, VerifyOTRActivity.class);
-                intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
-                intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
-                intent.putExtra(EXTRA_ACCOUNT, conversation.getAccount().getJid().toBareJid().toString());
-                switch (menuItem.getItemId()) {
-                    case R.id.scan_fingerprint:
-                        intent.putExtra("mode", VerifyOTRActivity.MODE_SCAN_FINGERPRINT);
-                        break;
-                    case R.id.ask_question:
-                        intent.putExtra("mode", VerifyOTRActivity.MODE_ASK_QUESTION);
-                        break;
-                    case R.id.manual_verification:
-                        intent.putExtra("mode", VerifyOTRActivity.MODE_MANUAL_VERIFICATION);
-                        break;
-                }
-                startActivity(intent);
-                return true;
-            }
-        });
-        popup.show();
-    }
-
-    @Override
-    public void onConversationArchived(Conversation conversation) {
-
-    }
-
-    @Override
-    public void onConversationsListItemUpdated() {
-        Fragment fragment = getFragmentManager().findFragmentById(R.id.main_fragment);
-        if (fragment != null && fragment instanceof ConversationsOverviewFragment) {
-            ((ConversationsOverviewFragment) fragment).refresh();
-        }
-    }
-
-    @Override
-    public void onConversationRead(Conversation conversation) {
-        Log.d(Config.LOGTAG, "read event for " + conversation.getName() + " received");
-    }
-
-    @Override
-    public void onAccountUpdate() {
-        this.refreshUi();
-    }
-
-    @Override
-    public void onConversationUpdate() {
-        this.refreshUi();
-    }
-
-    @Override
-    public void onRosterUpdate() {
-        this.refreshUi();
-    }
-
-    @Override
-    public void OnUpdateBlocklist(OnUpdateBlocklist.Status status) {
-        this.refreshUi();
-    }
-
-    @Override
-    public void onShowErrorToast(int resId) {
-        runOnUiThread(() -> Toast.makeText(this, resId, Toast.LENGTH_SHORT).show());
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
index b76f149f2..b6b1ba565 100644
--- a/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/SettingsActivity.java
@@ -36,6 +36,7 @@ import de.pixart.messenger.R;
 import de.pixart.messenger.entities.Account;
 import de.pixart.messenger.services.ExportLogsService;
 import de.pixart.messenger.services.MemorizingTrustManager;
+import de.pixart.messenger.ui.util.Color;
 import de.pixart.messenger.xmpp.XmppConnection;
 import de.pixart.messenger.xmpp.jid.InvalidJidException;
 import de.pixart.messenger.xmpp.jid.Jid;
@@ -76,6 +77,8 @@ public class SettingsActivity extends XmppActivity implements
 
         this.mTheme = findTheme();
         setTheme(this.mTheme);
+
+        getWindow().getDecorView().setBackgroundColor(Color.get(this, R.attr.color_background_primary));
     }
 
     @Override
diff --git a/src/main/java/de/pixart/messenger/ui/StartUI.java b/src/main/java/de/pixart/messenger/ui/StartUI.java
index 78a5754cd..08bd844ba 100644
--- a/src/main/java/de/pixart/messenger/ui/StartUI.java
+++ b/src/main/java/de/pixart/messenger/ui/StartUI.java
@@ -44,7 +44,7 @@ public class StartUI extends AppCompatActivity
         if (EasyPermissions.hasPermissions(this, perms)) {
             // Already have permission, start ConversationsActivity
             Log.d(Config.LOGTAG, "All permissions granted, starting " + getString(R.string.app_name) + "(" + FirstStartTime + ")");
-            Intent intent = new Intent(this, ConversationsMainActivity.class);
+            Intent intent = new Intent(this, ConversationActivity.class);
             intent.putExtra(PREF_FIRST_START, FirstStartTime);
             startActivity(intent);
             finish();
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 7e675dab0..81d87261c 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -502,27 +502,25 @@ public abstract class XmppActivity extends AppCompatActivity {
     }
 
     private void switchToConversation(Conversation conversation, String text, String nick, boolean pm, boolean newTask) {
-        Intent viewConversationIntent = new Intent(this,
-                ConversationActivity.class);
-        viewConversationIntent.setAction(ConversationActivity.ACTION_VIEW_CONVERSATION);
-        viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
-                conversation.getUuid());
+        Intent intent = new Intent(this, ConversationActivity.class);
+        intent.setAction(ConversationActivity.ACTION_VIEW_CONVERSATION);
+        intent.putExtra(ConversationActivity.EXTRA_CONVERSATION, conversation.getUuid());
         if (text != null) {
-            viewConversationIntent.putExtra(ConversationActivity.TEXT, text);
+            intent.putExtra(ConversationActivity.EXTRA_TEXT, text);
         }
         if (nick != null) {
-            viewConversationIntent.putExtra(ConversationActivity.NICK, nick);
-            viewConversationIntent.putExtra(ConversationActivity.PRIVATE_MESSAGE, pm);
+            intent.putExtra(ConversationActivity.EXTRA_NICK, nick);
+            intent.putExtra(ConversationActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
         }
         if (newTask) {
-            viewConversationIntent.setFlags(viewConversationIntent.getFlags()
+            intent.setFlags(intent.getFlags()
                     | Intent.FLAG_ACTIVITY_NEW_TASK
                     | Intent.FLAG_ACTIVITY_SINGLE_TOP);
         } else {
-            viewConversationIntent.setFlags(viewConversationIntent.getFlags()
+            intent.setFlags(intent.getFlags()
                     | Intent.FLAG_ACTIVITY_CLEAR_TOP);
         }
-        startActivity(viewConversationIntent);
+        startActivity(intent);
         finish();
     }
 
@@ -964,14 +962,6 @@ public abstract class XmppActivity extends AppCompatActivity {
         return this.mColorGreen;
     }
 
-    public int getPrimaryBackgroundColor() {
-        return this.mPrimaryBackgroundColor;
-    }
-
-    public int getSecondaryBackgroundColor() {
-        return this.mSecondaryBackgroundColor;
-    }
-
     public int getPixel(int dp) {
         DisplayMetrics metrics = getResources().getDisplayMetrics();
         return ((int) (dp * metrics.density));
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 35d4ad7f4..74a2b0e91 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -31,6 +31,7 @@ import de.pixart.messenger.entities.MucOptions;
 import de.pixart.messenger.entities.Transferable;
 import de.pixart.messenger.ui.ConversationFragment;
 import de.pixart.messenger.ui.XmppActivity;
+import de.pixart.messenger.ui.util.Color;
 import de.pixart.messenger.utils.EmojiWrapper;
 import de.pixart.messenger.utils.UIHelper;
 import de.pixart.messenger.xmpp.chatstate.ChatState;
@@ -77,13 +78,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
             view = inflater.inflate(R.layout.conversation_list_row, parent, false);
         }
+        ViewHolder viewHolder = ViewHolder.get(view);
         Conversation conversation = getItem(position);
         if (this.activity instanceof XmppActivity) {
-            View swipeableItem = view.findViewById(R.id.swipeable_item);
-            int c = conversation == selectedConversation ? this.activity.getSecondaryBackgroundColor() : this.activity.getPrimaryBackgroundColor();
-            swipeableItem.setBackgroundColor(c);
+            int c = Color.get(activity, conversation == selectedConversation ? R.attr.color_background_secondary: R.attr.color_background_primary);
+            viewHolder.swipeableItem.setBackgroundColor(c);
         }
-        ViewHolder viewHolder = ViewHolder.get(view);
         if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
             viewHolder.name.setText(EmojiWrapper.transform(conversation.getName()));
         } else {
@@ -309,6 +309,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
     }
 
     public static class ViewHolder {
+        private View swipeableItem;
         private TextView name;
         private TextView lastMessage;
         private ImageView lastMessageIcon;
@@ -329,6 +330,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             ViewHolder viewHolder = (ViewHolder) layout.getTag();
             if (viewHolder == null) {
                 viewHolder = new ViewHolder();
+                viewHolder.swipeableItem = layout.findViewById(R.id.swipeable_item);
                 viewHolder.name = layout.findViewById(R.id.conversation_name);
                 viewHolder.lastMessage = layout.findViewById(R.id.conversation_lastmsg);
                 viewHolder.lastMessageIcon = layout.findViewById(R.id.conversation_lastmsg_img);
diff --git a/src/main/java/de/pixart/messenger/ui/util/Color.java b/src/main/java/de/pixart/messenger/ui/util/Color.java
new file mode 100644
index 000000000..4a4ec45df
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/ui/util/Color.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2018, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.pixart.messenger.ui.util;
+
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.support.annotation.AttrRes;
+import android.support.annotation.ColorInt;
+import android.util.TypedValue;
+
+public class Color {
+
+    public static @ColorInt
+    int get(Context context, @AttrRes int attr) {
+        TypedValue typedValue = new TypedValue();
+        Resources.Theme theme = context.getTheme();
+        theme.resolveAttribute(attr, typedValue, true);
+        return typedValue.data;
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/res/layout-w945dp/activity_conversations.xml b/src/main/res/layout-w945dp/activity_conversations.xml
index 6084155e7..cb5f2ccad 100644
--- a/src/main/res/layout-w945dp/activity_conversations.xml
+++ b/src/main/res/layout-w945dp/activity_conversations.xml
@@ -9,13 +9,13 @@
             android:id="@+id/main_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:layout_weight="1000" />
 
         <FrameLayout
             android:id="@+id/secondary_fragment"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_weight="2" />
+            android:layout_weight="1618" />
 
     </LinearLayout>
 
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index 336142428..e400e291d 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -1,6 +1,7 @@
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <FrameLayout
+        android:background="?attr/color_background_primary"
         android:layout_width="match_parent"
         android:layout_height="match_parent">