renaming eu.siacs.conversations to de.thedevstack.conversationsplus

 "renaming eu.siacs.conversations to de.thedevstack.conversationsplus"

package renaming completed

28 files changed, 0 insertions, 8861 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java b/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
deleted file mode 100644
index a61b872a..00000000
--- a/src/main/java/eu/siacs/conversations/ui/AboutActivity.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-import eu.siacs.conversations.R;
-
-public class AboutActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
-    }
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java b/src/main/java/eu/siacs/conversations/ui/AboutPreference.java
deleted file mode 100644
index a57e1b89..00000000
--- a/src/main/java/eu/siacs/conversations/ui/AboutPreference.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.preference.Preference;
-import android.util.AttributeSet;
-
-import eu.siacs.conversations.utils.PhoneHelper;
-
-public class AboutPreference extends Preference {
-	public AboutPreference(final Context context, final AttributeSet attrs, final int defStyle) {
-		super(context, attrs, defStyle);
-		setSummary();
-	}
-
-	public AboutPreference(final Context context, final AttributeSet attrs) {
-		super(context, attrs);
-		setSummary();
-	}
-
-    @Override
-    protected void onClick() {
-        super.onClick();
-        final Intent intent = new Intent(getContext(), AboutActivity.class);
-        getContext().startActivity(intent);
-    }
-
-    private void setSummary() {
-		setSummary("Conversations " + PhoneHelper.getVersionName(getContext()));
-	}
-}
-
diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java
deleted file mode 100644
index 1a9fc95c..00000000
--- a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.content.Context;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ListView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.ui.adapter.ListItemAdapter;
-
-public abstract class AbstractSearchableListItemActivity extends XmppActivity {
-	private ListView mListView;
-	private final List<ListItem> listItems = new ArrayList<>();
-	private ArrayAdapter<ListItem> mListItemsAdapter;
-
-	private EditText mSearchEditText;
-
-	private final MenuItem.OnActionExpandListener mOnActionExpandListener = new MenuItem.OnActionExpandListener() {
-
-		@Override
-		public boolean onMenuItemActionExpand(final MenuItem item) {
-			mSearchEditText.post(new Runnable() {
-
-				@Override
-				public void run() {
-					mSearchEditText.requestFocus();
-					final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-					imm.showSoftInput(mSearchEditText,
-							InputMethodManager.SHOW_IMPLICIT);
-				}
-			});
-
-			return true;
-		}
-
-		@Override
-		public boolean onMenuItemActionCollapse(final MenuItem item) {
-			final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(mSearchEditText.getWindowToken(),
-					InputMethodManager.HIDE_IMPLICIT_ONLY);
-			mSearchEditText.setText("");
-			filterContacts();
-			return true;
-		}
-	};
-
-	private final TextWatcher mSearchTextWatcher = new TextWatcher() {
-
-		@Override
-		public void afterTextChanged(final Editable editable) {
-			filterContacts(editable.toString());
-		}
-
-		@Override
-		public void beforeTextChanged(final CharSequence s, final int start, final int count,
-				final int after) {
-		}
-
-		@Override
-		public void onTextChanged(final CharSequence s, final int start, final int before,
-				final int count) {
-		}
-	};
-
-	public ListView getListView() {
-		return mListView;
-	}
-
-	public List<ListItem> getListItems() {
-		return listItems;
-	}
-
-	public EditText getSearchEditText() {
-		return mSearchEditText;
-	}
-
-	public ArrayAdapter<ListItem> getListItemAdapter() {
-		return mListItemsAdapter;
-	}
-
-	@Override
-	public void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_choose_contact);
-		mListView = (ListView) findViewById(R.id.choose_contact_list);
-		mListView.setFastScrollEnabled(true);
-		mListItemsAdapter = new ListItemAdapter(this, listItems);
-		mListView.setAdapter(mListItemsAdapter);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(final Menu menu) {
-		getMenuInflater().inflate(R.menu.choose_contact, menu);
-		final MenuItem menuSearchView = menu.findItem(R.id.action_search);
-		final View mSearchView = menuSearchView.getActionView();
-		mSearchEditText = (EditText) mSearchView
-			.findViewById(R.id.search_field);
-		mSearchEditText.addTextChangedListener(mSearchTextWatcher);
-		menuSearchView.setOnActionExpandListener(mOnActionExpandListener);
-		return true;
-	}
-
-	protected void filterContacts() {
-		filterContacts(null);
-	}
-
-	protected abstract void filterContacts(final String needle);
-
-	@Override
-	void onBackendConnected() {
-		filterContacts();
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
deleted file mode 100644
index 9cf7e9f8..00000000
--- a/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Blockable;
-import eu.siacs.conversations.services.XmppConnectionService;
-
-public final class BlockContactDialog {
-	public static void show(final Context context,
-			final XmppConnectionService xmppConnectionService,
-			final Blockable blockable) {
-		final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-		final boolean isBlocked = blockable.isBlocked();
-		builder.setNegativeButton(R.string.cancel, null);
-
-		if (blockable.getJid().isDomainJid() || blockable.getAccount().isBlocked(blockable.getJid().toDomainJid())) {
-			builder.setTitle(isBlocked ? R.string.action_unblock_domain : R.string.action_block_domain);
-			builder.setMessage(context.getResources().getString(isBlocked ? R.string.unblock_domain_text : R.string.block_domain_text,
-						blockable.getJid().toDomainJid()));
-		} else {
-			builder.setTitle(isBlocked ? R.string.action_unblock_contact : R.string.action_block_contact);
-			builder.setMessage(context.getResources().getString(isBlocked ? R.string.unblock_contact_text : R.string.block_contact_text,
-						blockable.getJid().toBareJid()));
-		}
-		builder.setPositiveButton(isBlocked ? R.string.unblock : R.string.block, new DialogInterface.OnClickListener() {
-
-			@Override
-			public void onClick(final DialogInterface dialog, final int which) {
-				if (isBlocked) {
-					xmppConnectionService.sendUnblockRequest(blockable);
-				} else {
-					xmppConnectionService.sendBlockRequest(blockable);
-				}
-			}
-		});
-		builder.create().show();
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
deleted file mode 100644
index 13d7f4fc..00000000
--- a/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.os.Bundle;
-import android.text.Editable;
-import android.view.View;
-import android.widget.AdapterView;
-
-import java.util.Collections;
-
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class BlocklistActivity extends AbstractSearchableListItemActivity implements OnUpdateBlocklist {
-
-	private Account account = null;
-
-	@Override
-	public void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		getListView().setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-
-			@Override
-			public boolean onItemLongClick(final AdapterView<?> parent,
-					final View view,
-					final int position,
-					final long id) {
-				BlockContactDialog.show(parent.getContext(), xmppConnectionService,(Contact) getListItems().get(position));
-				return true;
-			}
-		});
-	}
-
-	@Override
-	public void onBackendConnected() {
-		for (final Account account : xmppConnectionService.getAccounts()) {
-			if (account.getJid().toString().equals(getIntent().getStringExtra("account"))) {
-				this.account = account;
-				break;
-			}
-		}
-		filterContacts();
-	}
-
-	@Override
-	protected void filterContacts(final String needle) {
-		getListItems().clear();
-		if (account != null) {
-			for (final Jid jid : account.getBlocklist()) {
-				final Contact contact = account.getRoster().getContact(jid);
-				if (contact.match(needle) && contact.isBlocked()) {
-					getListItems().add(contact);
-				}
-			}
-			Collections.sort(getListItems());
-		}
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				getListItemAdapter().notifyDataSetChanged();
-			}
-		});
-	}
-
-	@Override
-	public void OnUpdateBlocklist(final OnUpdateBlocklist.Status status) {
-		final Editable editable = getSearchEditText().getText();
-		if (editable != null) {
-			filterContacts(editable.toString());
-		} else {
-			filterContacts();
-		}
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
deleted file mode 100644
index aac435fd..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.os.Bundle;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class ChangePasswordActivity extends XmppActivity implements XmppConnectionService.OnAccountPasswordChanged {
-
-	private Button mChangePasswordButton;
-	private View.OnClickListener mOnChangePasswordButtonClicked = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			if (mAccount != null) {
-				final String currentPassword = mCurrentPassword.getText().toString();
-				final String newPassword = mNewPassword.getText().toString();
-				final String newPasswordConfirm = mNewPasswordConfirm.getText().toString();
-				if (!currentPassword.equals(mAccount.getPassword())) {
-					mCurrentPassword.requestFocus();
-					mCurrentPassword.setError(getString(R.string.account_status_unauthorized));
-				} else if (!newPassword.equals(newPasswordConfirm)) {
-                    mNewPasswordConfirm.requestFocus();
-                    mNewPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
-                } else if (newPassword.isEmpty()) {
-                    mNewPassword.requestFocus();
-                    mNewPassword.setError(getString(R.string.password_should_not_be_empty));
-				} else if (newPassword.trim().isEmpty()) {
-					mNewPassword.requestFocus();
-					mNewPassword.setError(getString(R.string.password_should_not_contain_only_spaces));
-				} else {
-					mCurrentPassword.setError(null);
-					mNewPassword.setError(null);
-					mNewPasswordConfirm.setError(null);
-					xmppConnectionService.updateAccountPasswordOnServer(mAccount, newPassword, ChangePasswordActivity.this);
-					mChangePasswordButton.setEnabled(false);
-					mChangePasswordButton.setTextColor(getSecondaryTextColor());
-					mChangePasswordButton.setText(R.string.updating);
-				}
-			}
-		}
-	};
-	private EditText mCurrentPassword;
-	private EditText mNewPassword;
-	private EditText mNewPasswordConfirm;
-	private Account mAccount;
-
-	@Override
-	void onBackendConnected() {
-		try {
-			final String jid = getIntent() == null ? null : getIntent().getStringExtra("account");
-			if (jid != null) {
-				this.mAccount = xmppConnectionService.findAccountByJid(Jid.fromString(jid));
-			}
-		} catch (final InvalidJidException ignored) {
-
-		}
-
-	}
-
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_change_password);
-		Button mCancelButton = (Button) findViewById(R.id.left_button);
-		mCancelButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				finish();
-			}
-		});
-		this.mChangePasswordButton = (Button) findViewById(R.id.right_button);
-		this.mChangePasswordButton.setOnClickListener(this.mOnChangePasswordButtonClicked);
-		this.mCurrentPassword = (EditText) findViewById(R.id.current_password);
-		this.mNewPassword = (EditText) findViewById(R.id.new_password);
-		this.mNewPasswordConfirm = (EditText) findViewById(R.id.new_password_confirm);
-	}
-
-	@Override
-	public void onPasswordChangeSucceeded() {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(ChangePasswordActivity.this,R.string.password_changed,Toast.LENGTH_LONG).show();
-				finish();
-			}
-		});
-	}
-
-	@Override
-	public void onPasswordChangeFailed() {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				mNewPassword.setError(getString(R.string.could_not_change_password));
-				mChangePasswordButton.setEnabled(true);
-				mChangePasswordButton.setTextColor(getPrimaryTextColor());
-				mChangePasswordButton.setText(R.string.change_password);
-			}
-		});
-
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
deleted file mode 100644
index c9e99ce5..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.ActionMode;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AbsListView.MultiChoiceModeListener;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import java.util.List;
-import java.util.ArrayList;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.ListItem;
-
-public class ChooseContactActivity extends AbstractSearchableListItemActivity {
-
-	private Set<Contact> selected;
-	private Set<String> filterContacts;
-
-	@Override
-	public void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		filterContacts = new HashSet<>();
-		String[] contacts = getIntent().getStringArrayExtra("filter_contacts");
-		if (contacts != null) {
-			Collections.addAll(filterContacts, contacts);
-		}
-
-		if (getIntent().getBooleanExtra("multiple", false)) {
-			getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL);
-			getListView().setMultiChoiceModeListener(new MultiChoiceModeListener() {
-
-				@Override
-				public  boolean onPrepareActionMode(ActionMode mode, Menu menu) {
-					return false;
-				}
-
-				@Override
-				public boolean onCreateActionMode(ActionMode mode, Menu menu) {
-					final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-					imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(),
-							InputMethodManager.HIDE_IMPLICIT_ONLY);
-					MenuInflater inflater = getMenuInflater();
-					inflater.inflate(R.menu.select_multiple, menu);
-					selected = new HashSet<Contact>();
-					return true;
-				}
-
-				@Override
-				public void onDestroyActionMode(ActionMode mode) {
-				}
-
-				@Override
-				public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
-					switch(item.getItemId()) {
-						case R.id.selection_submit:
-							final Intent request = getIntent();
-							final Intent data = new Intent();
-							data.putExtra("conversation",
-									request.getStringExtra("conversation"));
-							String[] selection = getSelectedContactJids();
-							data.putExtra("contacts", selection);
-							data.putExtra("multiple", true);
-							setResult(RESULT_OK, data);
-							finish();
-							return true;
-					}
-					return false;
-				}
-
-				@Override
-				public void onItemCheckedStateChanged(ActionMode mode, int position, long id, boolean checked) {
-					Contact item = (Contact) getListItems().get(position);
-					if (checked) {
-						selected.add(item);
-					} else {
-						selected.remove(item);
-					}
-					int numSelected = selected.size();
-					MenuItem selectButton = mode.getMenu().findItem(R.id.selection_submit);
-					String buttonText = getResources().getQuantityString(R.plurals.select_contact,
-							numSelected, numSelected);
-					selectButton.setTitle(buttonText);
-				}
-			});
-		}
-
-		getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
-
-			@Override
-			public void onItemClick(final AdapterView<?> parent, final View view,
-					final int position, final long id) {
-				final InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.hideSoftInputFromWindow(getSearchEditText().getWindowToken(),
-						InputMethodManager.HIDE_IMPLICIT_ONLY);
-				final Intent request = getIntent();
-				final Intent data = new Intent();
-				final ListItem mListItem = getListItems().get(position);
-				data.putExtra("contact", mListItem.getJid().toString());
-				String account = request.getStringExtra("account");
-				if (account == null && mListItem instanceof Contact) {
-					account = ((Contact) mListItem).getAccount().getJid().toBareJid().toString();
-				}
-				data.putExtra("account", account);
-				data.putExtra("conversation",
-						request.getStringExtra("conversation"));
-				data.putExtra("multiple", false);
-				setResult(RESULT_OK, data);
-				finish();
-			}
-		});
-
-	}
-
-	protected void filterContacts(final String needle) {
-		getListItems().clear();
-		for (final Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.State.DISABLED) {
-				for (final Contact contact : account.getRoster().getContacts()) {
-					if (contact.showInRoster() &&
-							!filterContacts.contains(contact.getJid().toBareJid().toString())
-							&& contact.match(needle)) {
-						getListItems().add(contact);
-					}
-				}
-			}
-		}
-		Collections.sort(getListItems());
-		getListItemAdapter().notifyDataSetChanged();
-	}
-
-	private String[] getSelectedContactJids() {
-		List<String> result = new ArrayList<>();
-		for (Contact contact : selected) {
-			result.add(contact.getJid().toString());
-		}
-		return result.toArray(new String[result.size()]);
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
deleted file mode 100644
index e4bfd6ff..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ /dev/null
@@ -1,563 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.annotation.TargetApi;
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.IntentSender.SendIntentException;
-import android.graphics.Bitmap;
-import android.os.Build;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.openintents.openpgp.util.OpenPgpUtils;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.crypto.PgpEngine;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Bookmark;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.MucOptions;
-import eu.siacs.conversations.entities.MucOptions.User;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.services.XmppConnectionService.OnMucRosterUpdate;
-import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class ConferenceDetailsActivity extends XmppActivity implements OnConversationUpdate, OnMucRosterUpdate, XmppConnectionService.OnAffiliationChanged, XmppConnectionService.OnRoleChanged, XmppConnectionService.OnConferenceOptionsPushed {
-	public static final String ACTION_VIEW_MUC = "view_muc";
-	private Conversation mConversation;
-	private OnClickListener inviteListener = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			inviteToConversation(mConversation);
-		}
-	};
-	private TextView mYourNick;
-	private ImageView mYourPhoto;
-	private ImageButton mEditNickButton;
-	private TextView mRoleAffiliaton;
-	private TextView mFullJid;
-	private TextView mAccountJid;
-	private LinearLayout membersView;
-	private LinearLayout mMoreDetails;
-	private TextView mConferenceType;
-	private ImageButton mChangeConferenceSettingsButton;
-	private Button mInviteButton;
-	private String uuid = null;
-	private User mSelectedUser = null;
-
-	private boolean mAdvancedMode = false;
-
-	private UiCallback<Conversation> renameCallback = new UiCallback<Conversation>() {
-		@Override
-		public void success(Conversation object) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(ConferenceDetailsActivity.this,getString(R.string.your_nick_has_been_changed),Toast.LENGTH_SHORT).show();
-					updateView();
-				}
-			});
-
-		}
-
-		@Override
-		public void error(final int errorCode, Conversation object) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(ConferenceDetailsActivity.this,getString(errorCode),Toast.LENGTH_SHORT).show();
-				}
-			});
-		}
-
-		@Override
-		public void userInputRequried(PendingIntent pi, Conversation object) {
-
-		}
-	};
-	private OnClickListener mChangeConferenceSettings = new OnClickListener() {
-		@Override
-		public void onClick(View v) {
-			final MucOptions mucOptions = mConversation.getMucOptions();
-			AlertDialog.Builder builder = new AlertDialog.Builder(ConferenceDetailsActivity.this);
-			builder.setTitle(R.string.conference_options);
-			String[] options = {getString(R.string.members_only),
-					getString(R.string.non_anonymous)};
-			final boolean[] values = new boolean[options.length];
-			values[0] = mucOptions.membersOnly();
-			values[1] = mucOptions.nonanonymous();
-			builder.setMultiChoiceItems(options,values,new DialogInterface.OnMultiChoiceClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which, boolean isChecked) {
-					values[which] = isChecked;
-				}
-			});
-			builder.setNegativeButton(R.string.cancel, null);
-			builder.setPositiveButton(R.string.confirm,new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					if (!mucOptions.membersOnly() && values[0]) {
-						xmppConnectionService.changeAffiliationsInConference(mConversation,
-								MucOptions.Affiliation.NONE,
-								MucOptions.Affiliation.MEMBER);
-					}
-					Bundle options = new Bundle();
-					options.putString("muc#roomconfig_membersonly", values[0] ? "1" : "0");
-					options.putString("muc#roomconfig_whois", values[1] ? "anyone" : "moderators");
-					options.putString("muc#roomconfig_persistentroom", "1");
-					xmppConnectionService.pushConferenceConfiguration(mConversation,
-							options,
-							ConferenceDetailsActivity.this);
-				}
-			});
-			builder.create().show();
-		}
-	};
-	private OnValueEdited onSubjectEdited = new OnValueEdited() {
-
-		@Override
-		public void onValueEdited(String value) {
-			xmppConnectionService.pushSubjectToConference(mConversation,value);
-		}
-	};
-
-	@Override
-	public void onConversationUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	public void onMucRosterUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		updateView();
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_muc_details);
-		mYourNick = (TextView) findViewById(R.id.muc_your_nick);
-		mYourPhoto = (ImageView) findViewById(R.id.your_photo);
-		mEditNickButton = (ImageButton) findViewById(R.id.edit_nick_button);
-		mFullJid = (TextView) findViewById(R.id.muc_jabberid);
-		membersView = (LinearLayout) findViewById(R.id.muc_members);
-		mAccountJid = (TextView) findViewById(R.id.details_account);
-		mMoreDetails = (LinearLayout) findViewById(R.id.muc_more_details);
-		mMoreDetails.setVisibility(View.GONE);
-		mChangeConferenceSettingsButton = (ImageButton) findViewById(R.id.change_conference_button);
-		mChangeConferenceSettingsButton.setOnClickListener(this.mChangeConferenceSettings);
-		mConferenceType = (TextView) findViewById(R.id.muc_conference_type);
-		mInviteButton = (Button) findViewById(R.id.invite);
-		mInviteButton.setOnClickListener(inviteListener);
-		mConferenceType = (TextView) findViewById(R.id.muc_conference_type);
-		if (getActionBar() != null) {
-			getActionBar().setHomeButtonEnabled(true);
-			getActionBar().setDisplayHomeAsUpEnabled(true);
-		}
-		mEditNickButton.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				quickEdit(mConversation.getMucOptions().getActualNick(),
-						new OnValueEdited() {
-
-							@Override
-							public void onValueEdited(String value) {
-								xmppConnectionService.renameInMuc(mConversation,value,renameCallback);
-							}
-						});
-			}
-		});
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem menuItem) {
-		switch (menuItem.getItemId()) {
-			case android.R.id.home:
-				finish();
-				break;
-			case R.id.action_edit_subject:
-				if (mConversation != null) {
-					quickEdit(mConversation.getName(),this.onSubjectEdited);
-				}
-				break;
-			case R.id.action_save_as_bookmark:
-				saveAsBookmark();
-				break;
-			case R.id.action_delete_bookmark:
-				deleteBookmark();
-				break;
-			case R.id.action_advanced_mode:
-				this.mAdvancedMode = !menuItem.isChecked();
-				menuItem.setChecked(this.mAdvancedMode);
-				invalidateOptionsMenu();
-				updateView();
-				break;
-		}
-		return super.onOptionsItemSelected(menuItem);
-	}
-
-	@Override
-	protected String getShareableUri() {
-		if (mConversation != null) {
-			return "xmpp:" + mConversation.getJid().toBareJid().toString() + "?join";
-		} else {
-			return "";
-		}
-	}
-
-	@Override
-	public boolean onPrepareOptionsMenu(Menu menu) {
-		MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark);
-		MenuItem menuItemDeleteBookmark = menu.findItem(R.id.action_delete_bookmark);
-		MenuItem menuItemAdvancedMode = menu.findItem(R.id.action_advanced_mode);
-		menuItemAdvancedMode.setChecked(mAdvancedMode);
-		Account account = mConversation.getAccount();
-		if (account.hasBookmarkFor(mConversation.getJid().toBareJid())) {
-			menuItemSaveBookmark.setVisible(false);
-			menuItemDeleteBookmark.setVisible(true);
-		} else {
-			menuItemDeleteBookmark.setVisible(false);
-			menuItemSaveBookmark.setVisible(true);
-		}
-		return true;
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.muc_details, menu);
-		return true;
-	}
-
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-		Object tag = v.getTag();
-		if (tag instanceof User) {
-			getMenuInflater().inflate(R.menu.muc_details_context,menu);
-			final User user = (User) tag;
-			final User self = mConversation.getMucOptions().getSelf();
-			this.mSelectedUser = user;
-			String name;
-			if (user.getJid() != null) {
-				final Contact contact = user.getContact();
-				if (contact != null) {
-					name = contact.getDisplayName();
-				} else {
-					name = user.getJid().toBareJid().toString();
-				}
-				menu.setHeaderTitle(name);
-				MenuItem startConversation = menu.findItem(R.id.start_conversation);
-				MenuItem giveMembership = menu.findItem(R.id.give_membership);
-				MenuItem removeMembership = menu.findItem(R.id.remove_membership);
-				MenuItem giveAdminPrivileges = menu.findItem(R.id.give_admin_privileges);
-				MenuItem removeAdminPrivileges = menu.findItem(R.id.remove_admin_privileges);
-				MenuItem removeFromRoom = menu.findItem(R.id.remove_from_room);
-				MenuItem banFromConference = menu.findItem(R.id.ban_from_conference);
-				startConversation.setVisible(true);
-				if (self.getAffiliation().ranks(MucOptions.Affiliation.ADMIN) &&
-						self.getAffiliation().outranks(user.getAffiliation())) {
-					if (mAdvancedMode) {
-						if (user.getAffiliation() == MucOptions.Affiliation.NONE) {
-							giveMembership.setVisible(true);
-						} else {
-							removeMembership.setVisible(true);
-						}
-						banFromConference.setVisible(true);
-					} else {
-						removeFromRoom.setVisible(true);
-					}
-					if (user.getAffiliation() != MucOptions.Affiliation.ADMIN) {
-						giveAdminPrivileges.setVisible(true);
-					} else {
-						removeAdminPrivileges.setVisible(true);
-					}
-				}
-			}
-
-		}
-		super.onCreateContextMenu(menu,v,menuInfo);
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.start_conversation:
-				startConversation(mSelectedUser);
-				return true;
-			case R.id.give_admin_privileges:
-				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.ADMIN,this);
-				return true;
-			case R.id.give_membership:
-				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.MEMBER,this);
-				return true;
-			case R.id.remove_membership:
-				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.NONE,this);
-				return true;
-			case R.id.remove_admin_privileges:
-				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.MEMBER,this);
-				return true;
-			case R.id.remove_from_room:
-				removeFromRoom(mSelectedUser);
-				return true;
-			case R.id.ban_from_conference:
-				xmppConnectionService.changeAffiliationInConference(mConversation,mSelectedUser.getJid(), MucOptions.Affiliation.OUTCAST,this);
-				xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,this);
-				return true;
-			default:
-				return super.onContextItemSelected(item);
-		}
-	}
-
-	private void removeFromRoom(final User user) {
-		if (mConversation.getMucOptions().membersOnly()) {
-			xmppConnectionService.changeAffiliationInConference(mConversation,user.getJid(), MucOptions.Affiliation.NONE,this);
-			xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,ConferenceDetailsActivity.this);
-		} else {
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setTitle(R.string.ban_from_conference);
-			builder.setMessage(getString(R.string.removing_from_public_conference,user.getName()));
-			builder.setNegativeButton(R.string.cancel,null);
-			builder.setPositiveButton(R.string.ban_now,new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					xmppConnectionService.changeAffiliationInConference(mConversation,user.getJid(), MucOptions.Affiliation.OUTCAST,ConferenceDetailsActivity.this);
-					xmppConnectionService.changeRoleInConference(mConversation,mSelectedUser.getName(), MucOptions.Role.NONE,ConferenceDetailsActivity.this);
-				}
-			});
-			builder.create().show();
-		}
-	}
-
-	protected void startConversation(User user) {
-		if (user.getJid() != null) {
-			Conversation conversation = xmppConnectionService.findOrCreateConversation(this.mConversation.getAccount(),user.getJid().toBareJid(),false);
-			switchToConversation(conversation);
-		}
-	}
-
-	protected void saveAsBookmark() {
-		Account account = mConversation.getAccount();
-		Bookmark bookmark = new Bookmark(account, mConversation.getJid().toBareJid());
-		if (!mConversation.getJid().isBareJid()) {
-			bookmark.setNick(mConversation.getJid().getResourcepart());
-		}
-		bookmark.setAutojoin(true);
-		account.getBookmarks().add(bookmark);
-		xmppConnectionService.pushBookmarks(account);
-		mConversation.setBookmark(bookmark);
-	}
-
-	protected void deleteBookmark() {
-		Account account = mConversation.getAccount();
-		Bookmark bookmark = mConversation.getBookmark();
-		bookmark.unregisterConversation();
-		account.getBookmarks().remove(bookmark);
-		xmppConnectionService.pushBookmarks(account);
-	}
-
-	@Override
-	void onBackendConnected() {
-		if (getIntent().getAction().equals(ACTION_VIEW_MUC)) {
-			this.uuid = getIntent().getExtras().getString("uuid");
-		}
-		if (uuid != null) {
-			this.mConversation = xmppConnectionService
-				.findConversationByUuid(uuid);
-			if (this.mConversation != null) {
-				updateView();
-			}
-		}
-	}
-
-	private void updateView() {
-		final MucOptions mucOptions = mConversation.getMucOptions();
-		final User self = mucOptions.getSelf();
-		mAccountJid.setText(getString(R.string.using_account, mConversation
-					.getAccount().getJid().toBareJid()));
-		mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48)));
-		setTitle(mConversation.getName());
-		mFullJid.setText(mConversation.getJid().toBareJid().toString());
-		mYourNick.setText(mucOptions.getActualNick());
-		mRoleAffiliaton = (TextView) findViewById(R.id.muc_role);
-		if (mucOptions.online()) {
-			mMoreDetails.setVisibility(View.VISIBLE);
-			final String status = getStatus(self);
-			if (status != null) {
-				mRoleAffiliaton.setVisibility(View.VISIBLE);
-				mRoleAffiliaton.setText(status);
-			} else {
-				mRoleAffiliaton.setVisibility(View.GONE);
-			}
-			if (mucOptions.membersOnly()) {
-				mConferenceType.setText(R.string.private_conference);
-			} else {
-				mConferenceType.setText(R.string.public_conference);
-			}
-			if (self.getAffiliation().ranks(MucOptions.Affiliation.OWNER)) {
-				mChangeConferenceSettingsButton.setVisibility(View.VISIBLE);
-			} else {
-				mChangeConferenceSettingsButton.setVisibility(View.GONE);
-			}
-		}
-		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		membersView.removeAllViews();
-		final ArrayList<User> users = new ArrayList<>();
-		users.addAll(mConversation.getMucOptions().getUsers());
-		Collections.sort(users,new Comparator<User>() {
-			@Override
-			public int compare(User lhs, User rhs) {
-				return lhs.getName().compareToIgnoreCase(rhs.getName());
-			}
-		});
-		for (final User user : users) {
-			View view = inflater.inflate(R.layout.contact, membersView,false);
-			this.setListItemBackgroundOnView(view);
-			view.setOnClickListener(new OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					highlightInMuc(mConversation, user.getName());
-				}
-			});
-			registerForContextMenu(view);
-			view.setTag(user);
-			TextView tvDisplayName = (TextView) view.findViewById(R.id.contact_display_name);
-			TextView tvKey = (TextView) view.findViewById(R.id.key);
-			TextView tvStatus = (TextView) view.findViewById(R.id.contact_jid);
-			if (mAdvancedMode && user.getPgpKeyId() != 0) {
-				tvKey.setVisibility(View.VISIBLE);
-				tvKey.setOnClickListener(new OnClickListener() {
-
-					@Override
-					public void onClick(View v) {
-						viewPgpKey(user);
-					}
-				});
-				tvKey.setText(OpenPgpUtils.convertKeyIdToHex(user.getPgpKeyId()));
-			}
-			Bitmap bm;
-			Contact contact = user.getContact();
-			if (contact != null) {
-				bm = avatarService().get(contact, getPixel(48));
-				tvDisplayName.setText(contact.getDisplayName());
-				tvStatus.setText(user.getName() + " \u2022 " + getStatus(user));
-			} else {
-				bm = avatarService().get(user.getName(), getPixel(48));
-				tvDisplayName.setText(user.getName());
-				tvStatus.setText(getStatus(user));
-
-			}
-			ImageView iv = (ImageView) view.findViewById(R.id.contact_photo);
-			iv.setImageBitmap(bm);
-			membersView.addView(view);
-			if (mConversation.getMucOptions().canInvite()) {
-				mInviteButton.setVisibility(View.VISIBLE);
-			} else {
-				mInviteButton.setVisibility(View.GONE);
-			}
-		}
-	}
-
-	private String getStatus(User user) {
-		if (mAdvancedMode) {
-			StringBuilder builder = new StringBuilder();
-			builder.append(getString(user.getAffiliation().getResId()));
-			builder.append(" (");
-			builder.append(getString(user.getRole().getResId()));
-			builder.append(')');
-			return builder.toString();
-		} else {
-			return getString(user.getAffiliation().getResId());
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-	private void setListItemBackgroundOnView(View view) {
-		int sdk = android.os.Build.VERSION.SDK_INT;
-		if (sdk < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-			view.setBackgroundDrawable(getResources().getDrawable(R.drawable.greybackground));
-		} else {
-			view.setBackground(getResources().getDrawable(R.drawable.greybackground));
-		}
-	}
-
-	private void viewPgpKey(User user) {
-		PgpEngine pgp = xmppConnectionService.getPgpEngine();
-		if (pgp != null) {
-			PendingIntent intent = pgp.getIntentForKey(
-					mConversation.getAccount(), user.getPgpKeyId());
-			if (intent != null) {
-				try {
-					startIntentSenderForResult(intent.getIntentSender(), 0,
-							null, 0, 0, 0);
-				} catch (SendIntentException ignored) {
-
-				}
-			}
-		}
-	}
-
-	@Override
-	public void onAffiliationChangedSuccessful(Jid jid) {
-
-	}
-
-	@Override
-	public void onAffiliationChangeFailed(Jid jid, int resId) {
-		displayToast(getString(resId,jid.toBareJid().toString()));
-	}
-
-	@Override
-	public void onRoleChangedSuccessful(String nick) {
-
-	}
-
-	@Override
-	public void onRoleChangeFailed(String nick, int resId) {
-		displayToast(getString(resId,nick));
-	}
-
-	@Override
-	public void onPushSucceeded() {
-		displayToast(getString(R.string.modified_conference_options));
-	}
-
-	@Override
-	public void onPushFailed() {
-		displayToast(getString(R.string.could_not_modify_conference_options));
-	}
-
-	private void displayToast(final String msg) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(ConferenceDetailsActivity.this,msg,Toast.LENGTH_SHORT).show();
-			}
-		});
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
deleted file mode 100644
index 40a4587c..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ /dev/null
@@ -1,471 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.AlertDialog;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
-import android.content.SharedPreferences;
-import android.net.Uri;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-import android.provider.ContactsContract.CommonDataKinds;
-import android.provider.ContactsContract.Contacts;
-import android.provider.ContactsContract.Intents;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
-import android.widget.QuickContactBadge;
-import android.widget.TextView;
-
-import org.openintents.openpgp.util.OpenPgpUtils;
-
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.crypto.PgpEngine;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
-import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.XmppConnection;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist {
-	public static final String ACTION_VIEW_CONTACT = "view_contact";
-
-	private Contact contact;
-	private DialogInterface.OnClickListener removeFromRoster = new DialogInterface.OnClickListener() {
-
-		@Override
-		public void onClick(DialogInterface dialog, int which) {
-			xmppConnectionService.deleteContactOnServer(contact);
-		}
-	};
-	private OnCheckedChangeListener mOnSendCheckedChange = new OnCheckedChangeListener() {
-
-		@Override
-		public void onCheckedChanged(CompoundButton buttonView,
-				boolean isChecked) {
-			if (isChecked) {
-				if (contact
-						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-					xmppConnectionService.sendPresencePacket(contact
-							.getAccount(),
-							xmppConnectionService.getPresenceGenerator()
-							.sendPresenceUpdatesTo(contact));
-				} else {
-					contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
-				}
-			} else {
-				contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
-				xmppConnectionService.sendPresencePacket(contact.getAccount(),
-						xmppConnectionService.getPresenceGenerator()
-						.stopPresenceUpdatesTo(contact));
-			}
-		}
-	};
-	private OnCheckedChangeListener mOnReceiveCheckedChange = new OnCheckedChangeListener() {
-
-		@Override
-		public void onCheckedChanged(CompoundButton buttonView,
-				boolean isChecked) {
-			if (isChecked) {
-				xmppConnectionService.sendPresencePacket(contact.getAccount(),
-						xmppConnectionService.getPresenceGenerator()
-						.requestPresenceUpdatesFrom(contact));
-			} else {
-				xmppConnectionService.sendPresencePacket(contact.getAccount(),
-						xmppConnectionService.getPresenceGenerator()
-						.stopPresenceUpdatesFrom(contact));
-			}
-		}
-	};
-	private Jid accountJid;
-	private Jid contactJid;
-	private TextView contactJidTv;
-	private TextView accountJidTv;
-	private TextView lastseen;
-	private CheckBox send;
-	private CheckBox receive;
-	private Button addContactButton;
-	private QuickContactBadge badge;
-	private LinearLayout keys;
-	private LinearLayout tags;
-	private boolean showDynamicTags;
-
-	private DialogInterface.OnClickListener addToPhonebook = new DialogInterface.OnClickListener() {
-
-		@Override
-		public void onClick(DialogInterface dialog, int which) {
-			Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
-			intent.setType(Contacts.CONTENT_ITEM_TYPE);
-			intent.putExtra(Intents.Insert.IM_HANDLE, contact.getJid().toString());
-			intent.putExtra(Intents.Insert.IM_PROTOCOL,
-					CommonDataKinds.Im.PROTOCOL_JABBER);
-			intent.putExtra("finishActivityOnSaveCompleted", true);
-			ContactDetailsActivity.this.startActivityForResult(intent, 0);
-		}
-	};
-
-	private OnClickListener onBadgeClick = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			AlertDialog.Builder builder = new AlertDialog.Builder(
-					ContactDetailsActivity.this);
-			builder.setTitle(getString(R.string.action_add_phone_book));
-			builder.setMessage(getString(R.string.add_phone_book_text,
-						contact.getJid()));
-			builder.setNegativeButton(getString(R.string.cancel), null);
-			builder.setPositiveButton(getString(R.string.add), addToPhonebook);
-			builder.create().show();
-		}
-	};
-
-	@Override
-	public void onRosterUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	public void onAccountUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		invalidateOptionsMenu();
-		populateView();
-	}
-
-	@Override
-	protected String getShareableUri() {
-		if (contact != null) {
-			return contact.getShareableUri();
-		} else {
-			return "";
-		}
-	}
-
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		if (getIntent().getAction().equals(ACTION_VIEW_CONTACT)) {
-			try {
-				this.accountJid = Jid.fromString(getIntent().getExtras().getString("account"));
-			} catch (final InvalidJidException ignored) {
-			}
-			try {
-				this.contactJid = Jid.fromString(getIntent().getExtras().getString("contact"));
-			} catch (final InvalidJidException ignored) {
-			}
-		}
-		setContentView(R.layout.activity_contact_details);
-
-		contactJidTv = (TextView) findViewById(R.id.details_contactjid);
-		accountJidTv = (TextView) findViewById(R.id.details_account);
-		lastseen = (TextView) findViewById(R.id.details_lastseen);
-		send = (CheckBox) findViewById(R.id.details_send_presence);
-		receive = (CheckBox) findViewById(R.id.details_receive_presence);
-		badge = (QuickContactBadge) findViewById(R.id.details_contact_badge);
-		addContactButton = (Button) findViewById(R.id.add_contact_button);
-		addContactButton.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				showAddToRosterDialog(contact);
-			}
-		});
-		keys = (LinearLayout) findViewById(R.id.details_contact_keys);
-		tags = (LinearLayout) findViewById(R.id.tags);
-		if (getActionBar() != null) {
-			getActionBar().setHomeButtonEnabled(true);
-			getActionBar().setDisplayHomeAsUpEnabled(true);
-		}
-
-		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-		this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false);
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem menuItem) {
-		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		switch (menuItem.getItemId()) {
-			case android.R.id.home:
-				finish();
-				break;
-			case R.id.action_delete_contact:
-				builder.setTitle(getString(R.string.action_delete_contact))
-					.setMessage(
-							getString(R.string.remove_contact_text,
-								contact.getJid()))
-					.setPositiveButton(getString(R.string.delete),
-							removeFromRoster).create().show();
-				break;
-			case R.id.action_edit_contact:
-				if (contact.getSystemAccount() == null) {
-					quickEdit(contact.getDisplayName(), new OnValueEdited() {
-
-						@Override
-						public void onValueEdited(String value) {
-							contact.setServerName(value);
-							ContactDetailsActivity.this.xmppConnectionService
-								.pushContactToServer(contact);
-							populateView();
-						}
-					});
-				} else {
-					Intent intent = new Intent(Intent.ACTION_EDIT);
-					String[] systemAccount = contact.getSystemAccount().split("#");
-					long id = Long.parseLong(systemAccount[0]);
-					Uri uri = Contacts.getLookupUri(id, systemAccount[1]);
-					intent.setDataAndType(uri, Contacts.CONTENT_ITEM_TYPE);
-					intent.putExtra("finishActivityOnSaveCompleted", true);
-					startActivity(intent);
-				}
-				break;
-			case R.id.action_block:
-				BlockContactDialog.show(this, xmppConnectionService, contact);
-				break;
-			case R.id.action_unblock:
-				BlockContactDialog.show(this, xmppConnectionService, contact);
-				break;
-		}
-		return super.onOptionsItemSelected(menuItem);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(final Menu menu) {
-		getMenuInflater().inflate(R.menu.contact_details, menu);
-		MenuItem block = menu.findItem(R.id.action_block);
-		MenuItem unblock = menu.findItem(R.id.action_unblock);
-		MenuItem edit = menu.findItem(R.id.action_edit_contact);
-		MenuItem delete = menu.findItem(R.id.action_delete_contact);
-		final XmppConnection connection = contact.getAccount().getXmppConnection();
-		if (connection != null && connection.getFeatures().blocking()) {
-			if (this.contact.isBlocked()) {
-				menu.findItem(R.id.action_block).setVisible(false);
-			} else {
-				menu.findItem(R.id.action_unblock).setVisible(false);
-			}
-		} else {
-			menu.findItem(R.id.action_unblock).setVisible(false);
-			menu.findItem(R.id.action_block).setVisible(false);
-		}
-		if (!contact.showInRoster()) {
-			edit.setVisible(false);
-			delete.setVisible(false);
-		}
-		return true;
-	}
-
-	private void populateView() {
-		setTitle(contact.getDisplayName());
-		if (contact.showInRoster()) {
-			send.setVisibility(View.VISIBLE);
-			receive.setVisibility(View.VISIBLE);
-			addContactButton.setVisibility(View.GONE);
-			send.setOnCheckedChangeListener(null);
-			receive.setOnCheckedChangeListener(null);
-
-			if (contact.getOption(Contact.Options.FROM)) {
-				send.setText(R.string.send_presence_updates);
-				send.setChecked(true);
-			} else if (contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-				send.setChecked(false);
-				send.setText(R.string.send_presence_updates);
-			} else {
-				send.setText(R.string.preemptively_grant);
-				if (contact.getOption(Contact.Options.PREEMPTIVE_GRANT)) {
-					send.setChecked(true);
-				} else {
-					send.setChecked(false);
-				}
-			}
-			if (contact.getOption(Contact.Options.TO)) {
-				receive.setText(R.string.receive_presence_updates);
-				receive.setChecked(true);
-			} else {
-				receive.setText(R.string.ask_for_presence_updates);
-				if (contact.getOption(Contact.Options.ASKING)) {
-					receive.setChecked(true);
-				} else {
-					receive.setChecked(false);
-				}
-			}
-			if (contact.getAccount().isOnlineAndConnected()) {
-				receive.setEnabled(true);
-				send.setEnabled(true);
-			} else {
-				receive.setEnabled(false);
-				send.setEnabled(false);
-			}
-
-			send.setOnCheckedChangeListener(this.mOnSendCheckedChange);
-			receive.setOnCheckedChangeListener(this.mOnReceiveCheckedChange);
-		} else {
-			addContactButton.setVisibility(View.VISIBLE);
-			send.setVisibility(View.GONE);
-			receive.setVisibility(View.GONE);
-		}
-
-		if (contact.isBlocked() && !this.showDynamicTags) {
-			lastseen.setText(R.string.contact_blocked);
-		} else {
-			lastseen.setText(UIHelper.lastseen(getApplicationContext(), contact.lastseen.time));
-		}
-
-		if (contact.getPresences().size() > 1) {
-			contactJidTv.setText(contact.getJid() + " ("
-					+ contact.getPresences().size() + ")");
-		} else {
-			contactJidTv.setText(contact.getJid().toString());
-		}
-		accountJidTv.setText(getString(R.string.using_account, contact
-					.getAccount().getJid().toBareJid()));
-		prepareContactBadge(badge, contact);
-		if (contact.getSystemAccount() == null) {
-			badge.setOnClickListener(onBadgeClick);
-		}
-
-		keys.removeAllViews();
-		boolean hasKeys = false;
-		LayoutInflater inflater = (LayoutInflater) getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		for(final String otrFingerprint : contact.getOtrFingerprints()) {
-			hasKeys = true;
-			View view = inflater.inflate(R.layout.contact_key, keys, false);
-			TextView key = (TextView) view.findViewById(R.id.key);
-			TextView keyType = (TextView) view.findViewById(R.id.key_type);
-			ImageButton remove = (ImageButton) view
-				.findViewById(R.id.button_remove);
-			remove.setVisibility(View.VISIBLE);
-			keyType.setText("OTR Fingerprint");
-			key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
-			keys.addView(view);
-			remove.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					confirmToDeleteFingerprint(otrFingerprint);
-				}
-			});
-		}
-		if (contact.getPgpKeyId() != 0) {
-			hasKeys = true;
-			View view = inflater.inflate(R.layout.contact_key, keys, false);
-			TextView key = (TextView) view.findViewById(R.id.key);
-			TextView keyType = (TextView) view.findViewById(R.id.key_type);
-			keyType.setText("PGP Key ID");
-			key.setText(OpenPgpUtils.convertKeyIdToHex(contact.getPgpKeyId()));
-			view.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					PgpEngine pgp = ContactDetailsActivity.this.xmppConnectionService
-						.getPgpEngine();
-					if (pgp != null) {
-						PendingIntent intent = pgp.getIntentForKey(contact);
-						if (intent != null) {
-							try {
-								startIntentSenderForResult(
-										intent.getIntentSender(), 0, null, 0,
-										0, 0);
-							} catch (SendIntentException e) {
-
-							}
-						}
-					}
-				}
-			});
-			keys.addView(view);
-		}
-		if (hasKeys) {
-			keys.setVisibility(View.VISIBLE);
-		} else {
-			keys.setVisibility(View.GONE);
-		}
-
-		List<ListItem.Tag> tagList = contact.getTags();
-		if (tagList.size() == 0 || !this.showDynamicTags) {
-			tags.setVisibility(View.GONE);
-		} else {
-			tags.setVisibility(View.VISIBLE);
-			tags.removeAllViewsInLayout();
-			for(final ListItem.Tag tag : tagList) {
-				final TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag,tags,false);
-				tv.setText(tag.getName());
-				tv.setBackgroundColor(tag.getColor());
-				tags.addView(tv);
-			}
-		}
-	}
-
-	private void prepareContactBadge(QuickContactBadge badge, Contact contact) {
-		if (contact.getSystemAccount() != null) {
-			String[] systemAccount = contact.getSystemAccount().split("#");
-			long id = Long.parseLong(systemAccount[0]);
-			badge.assignContactUri(Contacts.getLookupUri(id, systemAccount[1]));
-		}
-		badge.setImageBitmap(avatarService().get(contact, getPixel(72)));
-	}
-
-	protected void confirmToDeleteFingerprint(final String fingerprint) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.delete_fingerprint);
-		builder.setMessage(R.string.sure_delete_fingerprint);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.delete,
-				new android.content.DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (contact.deleteOtrFingerprint(fingerprint)) {
-							populateView();
-							xmppConnectionService.syncRosterToDisk(contact.getAccount());
-						}
-					}
-
-				});
-		builder.create().show();
-	}
-
-	@Override
-	public void onBackendConnected() {
-		if ((accountJid != null) && (contactJid != null)) {
-			Account account = xmppConnectionService
-				.findAccountByJid(accountJid);
-			if (account == null) {
-				return;
-			}
-			this.contact = account.getRoster().getContact(contactJid);
-			populateView();
-		}
-	}
-
-	@Override
-	public void OnUpdateBlocklist(final Status status) {
-		runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				invalidateOptionsMenu();
-				populateView();
-			}
-		});
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
deleted file mode 100644
index 0fbaa479..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ /dev/null
@@ -1,1116 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.annotation.SuppressLint;
-import android.app.ActionBar;
-import android.app.AlertDialog;
-import android.app.FragmentTransaction;
-import android.app.PendingIntent;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
-import android.net.Uri;
-import android.os.Build;
-import android.os.Bundle;
-import android.provider.MediaStore;
-import android.support.v4.widget.SlidingPaneLayout;
-import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.CheckBox;
-import android.widget.ListView;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.Toast;
-
-import net.java.otr4j.session.SessionStatus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Blockable;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
-import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdate;
-import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
-import eu.siacs.conversations.ui.adapter.ConversationAdapter;
-import eu.siacs.conversations.utils.ExceptionHelper;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import github.ankushsachdeva.emojicon.EmojiconEditText;
-
-public class ConversationActivity extends XmppActivity
-	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist {
-
-	public static final String ACTION_DOWNLOAD = "eu.siacs.conversations.action.DOWNLOAD";
-
-	public static final String VIEW_CONVERSATION = "viewConversation";
-	public static final String CONVERSATION = "conversationUuid";
-	public static final String MESSAGE = "messageUuid";
-	public static final String TEXT = "text";
-	public static final String NICK = "nick";
-
-	public static final int REQUEST_SEND_MESSAGE = 0x0201;
-	public static final int REQUEST_DECRYPT_PGP = 0x0202;
-	public static final int REQUEST_ENCRYPT_MESSAGE = 0x0207;
-	private static final int ATTACHMENT_CHOICE_CHOOSE_IMAGE = 0x0301;
-	private static final int ATTACHMENT_CHOICE_TAKE_PHOTO = 0x0302;
-	private static final int ATTACHMENT_CHOICE_CHOOSE_FILE = 0x0303;
-	private static final int ATTACHMENT_CHOICE_RECORD_VOICE = 0x0304;
-	private static final int ATTACHMENT_CHOICE_LOCATION = 0x0305;
-	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_URI = "state_pending_uri";
-
-	private String mOpenConverstaion = null;
-	private boolean mPanelOpen = true;
-	private Uri mPendingImageUri = null;
-	private Uri mPendingFileUri = null;
-	private Uri mPendingGeoUri = null;
-
-	private View mContentView;
-
-	private List<Conversation> conversationList = new ArrayList<>();
-	private Conversation mSelectedConversation = null;
-	private ListView listView;
-	private ConversationFragment mConversationFragment;
-
-	private ArrayAdapter<Conversation> listAdapter;
-
-	private Toast prepareFileToast;
-
-	private boolean mActivityPaused = false;
-	private boolean mRedirected = true;
-
-	public Conversation getSelectedConversation() {
-		return this.mSelectedConversation;
-	}
-
-	public void setSelectedConversation(Conversation conversation) {
-		this.mSelectedConversation = conversation;
-	}
-
-	public void showConversationsOverview() {
-		if (mContentView instanceof SlidingPaneLayout) {
-			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-			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;
-			mSlidingPaneLayout.closePane();
-		}
-	}
-
-	public boolean isConversationsOverviewHideable() {
-		if (mContentView instanceof SlidingPaneLayout) {
-			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-			return mSlidingPaneLayout.isSlideable();
-		} else {
-			return false;
-		}
-	}
-
-	public boolean isConversationsOverviewVisable() {
-		if (mContentView instanceof SlidingPaneLayout) {
-			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
-			return mSlidingPaneLayout.isOpen();
-		} else {
-			return true;
-		}
-	}
-
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		if (savedInstanceState != null) {
-            mOpenConverstaion = savedInstanceState.getString(STATE_OPEN_CONVERSATION, null);
-            mPanelOpen = savedInstanceState.getBoolean(STATE_PANEL_OPEN, true);
-            String pending = savedInstanceState.getString(STATE_PENDING_URI, null);
-            if (pending != null) {
-                mPendingImageUri = Uri.parse(pending);
-            }
-		}
-
-		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 = (ListView) findViewById(R.id.list);
-		this.listAdapter = new ConversationAdapter(this, conversationList);
-		listView.setAdapter(this.listAdapter);
-
-		if (getActionBar() != null) {
-			getActionBar().setDisplayHomeAsUpEnabled(false);
-			getActionBar().setHomeButtonEnabled(false);
-		}
-
-		listView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View clickedView,
-					int position, long arg3) {
-				if (getSelectedConversation() != conversationList.get(position)) {
-					setSelectedConversation(conversationList.get(position));
-					ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				}
-				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.setParallaxDistance(150);
-			mSlidingPaneLayout
-				.setShadowResource(R.drawable.es_slidingpane_shadow);
-			mSlidingPaneLayout.setSliderFadeColor(0);
-			mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
-
-				@Override
-				public void onPanelOpened(View arg0) {
-					updateActionBarTitle();
-					invalidateOptionsMenu();
-					hideKeyboard();
-					if (xmppConnectionServiceBound) {
-						xmppConnectionService.getNotificationService()
-							.setOpenConversation(null);
-					}
-					closeContextMenu();
-				}
-
-				@Override
-				public void onPanelClosed(View arg0) {
-					openConversation();
-				}
-
-				@Override
-				public void onPanelSlide(View arg0, float arg1) {
-					// TODO Auto-generated method stub
-
-				}
-			});
-		}
-	}
-
-	@Override
-	public void switchToConversation(Conversation conversation) {
-		setSelectedConversation(conversation);
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				openConversation();
-			}
-		});
-	}
-
-	private void updateActionBarTitle() {
-		updateActionBarTitle(isConversationsOverviewHideable() && !isConversationsOverviewVisable());
-	}
-
-	private void updateActionBarTitle(boolean titleShouldBeName) {
-		final ActionBar ab = getActionBar();
-		final Conversation conversation = getSelectedConversation();
-		if (ab != null) {
-			if (titleShouldBeName && conversation != null) {
-				ab.setDisplayHomeAsUpEnabled(true);
-				ab.setHomeButtonEnabled(true);
-				if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) {
-					ab.setTitle(conversation.getName());
-				} else {
-					ab.setTitle(conversation.getJid().toBareJid().toString());
-				}
-			} else {
-				ab.setDisplayHomeAsUpEnabled(false);
-				ab.setHomeButtonEnabled(false);
-				ab.setTitle(R.string.app_name);
-			}
-		}
-	}
-
-	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 && conversation != null) {
-			if (!conversation.isRead()) {
-				xmppConnectionService.sendReadMarker(conversation);
-			} else {
-				xmppConnectionService.markRead(conversation);
-			}
-		}
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.conversations, menu);
-		final MenuItem menuSecure = menu.findItem(R.id.action_security);
-		final MenuItem menuArchive = menu.findItem(R.id.action_archive);
-		final MenuItem menuMucDetails = menu.findItem(R.id.action_muc_details);
-		final MenuItem menuContactDetails = menu.findItem(R.id.action_contact_details);
-		final MenuItem menuAttach = menu.findItem(R.id.action_attach_file);
-		final MenuItem menuClearHistory = menu.findItem(R.id.action_clear_history);
-		final MenuItem menuAdd = menu.findItem(R.id.action_add);
-		final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
-		final MenuItem menuMute = menu.findItem(R.id.action_mute);
-		final MenuItem menuUnmute = menu.findItem(R.id.action_unmute);
-
-		if (isConversationsOverviewVisable() && isConversationsOverviewHideable()) {
-			menuArchive.setVisible(false);
-			menuMucDetails.setVisible(false);
-			menuContactDetails.setVisible(false);
-			menuSecure.setVisible(false);
-			menuInviteContact.setVisible(false);
-			menuAttach.setVisible(false);
-			menuClearHistory.setVisible(false);
-			menuMute.setVisible(false);
-			menuUnmute.setVisible(false);
-		} else {
-			menuAdd.setVisible(!isConversationsOverviewHideable());
-			if (this.getSelectedConversation() != null) {
-				if (this.getSelectedConversation().getLatestMessage()
-						.getEncryption() != Message.ENCRYPTION_NONE) {
-					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-						menuSecure.setIcon(R.drawable.ic_lock_outline_white_48dp);
-					} else {
-						menuSecure.setIcon(R.drawable.ic_action_secure);
-					}
-				}
-				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
-					menuContactDetails.setVisible(false);
-					menuAttach.setVisible(false);
-					menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite());
-				} else {
-					menuMucDetails.setVisible(false);
-				}
-				if (this.getSelectedConversation().isMuted()) {
-					menuMute.setVisible(false);
-				} else {
-					menuUnmute.setVisible(false);
-				}
-			}
-		}
-		return true;
-	}
-
-	private void selectPresenceToAttachFile(final int attachmentChoice, final int encryption) {
-		if (attachmentChoice == ATTACHMENT_CHOICE_LOCATION && encryption != Message.ENCRYPTION_OTR) {
-			getSelectedConversation().setNextCounterpart(null);
-			Intent intent = new Intent("eu.siacs.conversations.location.request");
-			startActivityForResult(intent,attachmentChoice);
-		} else {
-			selectPresence(getSelectedConversation(), new OnPresenceSelected() {
-
-				@Override
-				public void onPresenceSelected() {
-					Intent intent = new Intent();
-					boolean chooser = false;
-					switch (attachmentChoice) {
-						case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
-							intent.setAction(Intent.ACTION_GET_CONTENT);
-							intent.setType("image/*");
-							chooser = true;
-							break;
-						case ATTACHMENT_CHOICE_TAKE_PHOTO:
-							mPendingImageUri = xmppConnectionService.getFileBackend().getTakePhotoUri();
-							intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);
-							intent.putExtra(MediaStore.EXTRA_OUTPUT, mPendingImageUri);
-							break;
-						case ATTACHMENT_CHOICE_CHOOSE_FILE:
-							chooser = true;
-							intent.setType("*/*");
-							intent.addCategory(Intent.CATEGORY_OPENABLE);
-							intent.setAction(Intent.ACTION_GET_CONTENT);
-							break;
-						case ATTACHMENT_CHOICE_RECORD_VOICE:
-							intent.setAction(MediaStore.Audio.Media.RECORD_SOUND_ACTION);
-							break;
-						case ATTACHMENT_CHOICE_LOCATION:
-							intent.setAction("eu.siacs.conversations.location.request");
-							break;
-					}
-					if (intent.resolveActivity(getPackageManager()) != null) {
-						if (chooser) {
-							startActivityForResult(
-									Intent.createChooser(intent, getString(R.string.perform_action_with)),
-									attachmentChoice);
-						} else {
-							startActivityForResult(intent, attachmentChoice);
-						}
-					}
-				}
-			});
-		}
-	}
-
-	private void attachFile(final int attachmentChoice) {
-		final Conversation conversation = getSelectedConversation();
-		final int encryption = conversation.getNextEncryption(forceEncryption());
-		if (encryption == Message.ENCRYPTION_PGP) {
-			if (hasPgp()) {
-				if (conversation.getContact().getPgpKeyId() != 0) {
-					xmppConnectionService.getPgpEngine().hasKey(
-							conversation.getContact(),
-							new UiCallback<Contact>() {
-
-								@Override
-								public void userInputRequried(PendingIntent pi,
-										Contact contact) {
-									ConversationActivity.this.runIntent(pi,attachmentChoice);
-								}
-
-								@Override
-								public void success(Contact contact) {
-									selectPresenceToAttachFile(attachmentChoice,encryption);
-								}
-
-								@Override
-								public void error(int error, Contact contact) {
-									displayErrorDialog(error);
-								}
-							});
-				} else {
-					final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-						.findFragmentByTag("conversation");
-					if (fragment != null) {
-						fragment.showNoPGPKeyDialog(false,
-								new OnClickListener() {
-
-									@Override
-									public void onClick(DialogInterface dialog,
-											int which) {
-										conversation
-											.setNextEncryption(Message.ENCRYPTION_NONE);
-										xmppConnectionService.databaseBackend
-											.updateConversation(conversation);
-										selectPresenceToAttachFile(attachmentChoice,Message.ENCRYPTION_NONE);
-									}
-								});
-					}
-				}
-			} else {
-				showInstallPgpDialog();
-			}
-		} else {
-			selectPresenceToAttachFile(attachmentChoice,encryption);
-		}
-	}
-
-	@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 if (getSelectedConversation() != null) {
-			switch (item.getItemId()) {
-				case R.id.action_attach_file:
-					attachFileDialog();
-					break;
-				case R.id.action_archive:
-					this.endConversation(getSelectedConversation());
-					break;
-				case R.id.action_contact_details:
-					switchToContactDetails(getSelectedConversation().getContact());
-					break;
-				case R.id.action_muc_details:
-					Intent intent = new Intent(this,
-							ConferenceDetailsActivity.class);
-					intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
-					intent.putExtra("uuid", getSelectedConversation().getUuid());
-					startActivity(intent);
-					break;
-				case R.id.action_invite:
-					inviteToConversation(getSelectedConversation());
-					break;
-				case R.id.action_security:
-					selectEncryptionDialog(getSelectedConversation());
-					break;
-				case R.id.action_clear_history:
-					clearHistoryDialog(getSelectedConversation());
-					break;
-				case R.id.action_mute:
-					muteConversationDialog(getSelectedConversation());
-					break;
-				case R.id.action_unmute:
-					unmuteConversation(getSelectedConversation());
-					break;
-				case R.id.action_block:
-					BlockContactDialog.show(this, xmppConnectionService, getSelectedConversation());
-					break;
-				case R.id.action_unblock:
-					BlockContactDialog.show(this, xmppConnectionService, getSelectedConversation());
-					break;
-				default:
-					break;
-			}
-			return super.onOptionsItemSelected(item);
-		} else {
-			return super.onOptionsItemSelected(item);
-		}
-	}
-
-	public void endConversation(Conversation conversation) {
-		showConversationsOverview();
-		xmppConnectionService.archiveConversation(conversation);
-		if (conversationList.size() > 0) {
-			setSelectedConversation(conversationList.get(0));
-			this.mConversationFragment.reInit(getSelectedConversation());
-		} else {
-			setSelectedConversation(null);
-		}
-	}
-
-	@SuppressLint("InflateParams")
-	protected void clearHistoryDialog(final Conversation conversation) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(getString(R.string.clear_conversation_history));
-		View dialogView = getLayoutInflater().inflate(
-				R.layout.dialog_clear_history, null);
-		final CheckBox endConversationCheckBox = (CheckBox) dialogView
-			.findViewById(R.id.end_conversation_checkbox);
-		builder.setView(dialogView);
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setPositiveButton(getString(R.string.delete_messages),
-				new OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-						if (endConversationCheckBox.isChecked()) {
-							endConversation(conversation);
-						} else {
-							updateConversationList();
-							ConversationActivity.this.mConversationFragment.updateMessages();
-						}
-					}
-				});
-		builder.create().show();
-	}
-
-	protected void attachFileDialog() {
-		View menuAttachFile = findViewById(R.id.action_attach_file);
-		if (menuAttachFile == null) {
-			return;
-		}
-		PopupMenu attachFilePopup = new PopupMenu(this, menuAttachFile);
-		attachFilePopup.inflate(R.menu.attachment_choices);
-		if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) {
-			attachFilePopup.getMenu().findItem(R.id.attach_record_voice).setVisible(false);
-		}
-		if (new Intent("eu.siacs.conversations.location.request").resolveActivity(getPackageManager()) == null) {
-			attachFilePopup.getMenu().findItem(R.id.attach_location).setVisible(false);
-		}
-		attachFilePopup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-
-			@Override
-			public boolean onMenuItemClick(MenuItem item) {
-				switch (item.getItemId()) {
-					case R.id.attach_choose_picture:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
-						break;
-					case R.id.attach_take_picture:
-						attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
-						break;
-					case R.id.attach_choose_file:
-						attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
-						break;
-					case R.id.attach_record_voice:
-						attachFile(ATTACHMENT_CHOICE_RECORD_VOICE);
-						break;
-					case R.id.attach_location:
-						attachFile(ATTACHMENT_CHOICE_LOCATION);
-						break;
-				}
-				return false;
-			}
-		});
-		attachFilePopup.show();
-	}
-
-	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 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("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();
-	}
-
-	protected void selectEncryptionDialog(final Conversation conversation) {
-		View menuItemView = findViewById(R.id.action_security);
-		if (menuItemView == null) {
-			return;
-		}
-		PopupMenu popup = new PopupMenu(this, menuItemView);
-		final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-			.findFragmentByTag("conversation");
-		if (fragment != null) {
-			popup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
-
-				@Override
-				public boolean onMenuItemClick(MenuItem item) {
-					switch (item.getItemId()) {
-						case R.id.encryption_choice_none:
-							conversation.setNextEncryption(Message.ENCRYPTION_NONE);
-							item.setChecked(true);
-							break;
-						case R.id.encryption_choice_otr:
-							conversation.setNextEncryption(Message.ENCRYPTION_OTR);
-							item.setChecked(true);
-							break;
-						case R.id.encryption_choice_pgp:
-							if (hasPgp()) {
-								if (conversation.getAccount().getKeys()
-										.has("pgp_signature")) {
-									conversation
-										.setNextEncryption(Message.ENCRYPTION_PGP);
-									item.setChecked(true);
-								} else {
-									announcePgp(conversation.getAccount(),
-											conversation);
-								}
-							} else {
-								showInstallPgpDialog();
-							}
-							break;
-						default:
-							conversation.setNextEncryption(Message.ENCRYPTION_NONE);
-							break;
-					}
-					xmppConnectionService.databaseBackend
-						.updateConversation(conversation);
-					fragment.updateChatMsgHint();
-					return true;
-				}
-			});
-			popup.inflate(R.menu.encryption_choices);
-			MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr);
-			MenuItem none = popup.getMenu().findItem(
-					R.id.encryption_choice_none);
-			if (conversation.getMode() == Conversation.MODE_MULTI) {
-				otr.setEnabled(false);
-			} else {
-				if (forceEncryption()) {
-					none.setVisible(false);
-				}
-			}
-			switch (conversation.getNextEncryption(forceEncryption())) {
-				case Message.ENCRYPTION_NONE:
-					none.setChecked(true);
-					break;
-				case Message.ENCRYPTION_OTR:
-					otr.setChecked(true);
-					break;
-				case Message.ENCRYPTION_PGP:
-					popup.getMenu().findItem(R.id.encryption_choice_pgp)
-						.setChecked(true);
-					break;
-				default:
-					popup.getMenu().findItem(R.id.encryption_choice_none)
-						.setChecked(true);
-					break;
-			}
-			popup.show();
-		}
-	}
-
-	protected void muteConversationDialog(final Conversation conversation) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.disable_notifications);
-		final int[] durations = getResources().getIntArray(
-				R.array.mute_options_durations);
-		builder.setItems(R.array.mute_options_descriptions,
-				new OnClickListener() {
-
-					@Override
-					public void onClick(final DialogInterface dialog, final int which) {
-						final long till;
-						if (durations[which] == -1) {
-							till = Long.MAX_VALUE;
-						} else {
-							till = System.currentTimeMillis() + (durations[which] * 1000);
-						}
-						conversation.setMutedTill(till);
-						ConversationActivity.this.xmppConnectionService.databaseBackend
-							.updateConversation(conversation);
-						updateConversationList();
-						ConversationActivity.this.mConversationFragment.updateMessages();
-						invalidateOptionsMenu();
-					}
-				});
-		builder.create().show();
-	}
-
-	public void unmuteConversation(final Conversation conversation) {
-		conversation.setMutedTill(0);
-		this.xmppConnectionService.databaseBackend.updateConversation(conversation);
-		updateConversationList();
-		ConversationActivity.this.mConversationFragment.updateMessages();
-		invalidateOptionsMenu();
-	}
-
-	@Override
-	public void onBackPressed() {
-		if (!isConversationsOverviewVisable()) {
-			showConversationsOverview();
-		} else {
-			moveTaskToBack(true);
-		}
-	}
-
-	@Override
-	protected void onNewIntent(final Intent intent) {
-		if (xmppConnectionServiceBound) {
-			if (intent != null && VIEW_CONVERSATION.equals(intent.getType())) {
-				handleViewConversationIntent(intent);
-			}
-		} else {
-			setIntent(intent);
-		}
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		this.mRedirected = false;
-		if (this.xmppConnectionServiceBound) {
-			this.onBackendConnected();
-		}
-		if (conversationList.size() >= 1) {
-			this.onConversationUpdate();
-		}
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-		this.mActivityPaused = true;
-		if (this.xmppConnectionServiceBound) {
-			this.xmppConnectionService.getNotificationService().setIsInForeground(false);
-		}
-	}
-
-	@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 (this.xmppConnectionServiceBound) {
-			this.xmppConnectionService.getNotificationService().setIsInForeground(true);
-		}
-
-		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());
-		}
-		savedInstanceState.putBoolean(STATE_PANEL_OPEN,
-				isConversationsOverviewVisable());
-		if (this.mPendingImageUri != null) {
-			savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUri.toString());
-		}
-		super.onSaveInstanceState(savedInstanceState);
-	}
-
-	@Override
-	void onBackendConnected() {
-		this.xmppConnectionService.getNotificationService().setIsInForeground(true);
-		updateConversationList();
-		if (xmppConnectionService.getAccounts().size() == 0) {
-			if (!mRedirected) {
-				this.mRedirected = true;
-				startActivity(new Intent(this, EditAccountActivity.class));
-				finish();
-			}
-		} else if (conversationList.size() <= 0) {
-			if (!mRedirected) {
-				this.mRedirected = true;
-				Intent intent = new Intent(this, StartConversationActivity.class);
-				intent.putExtra("init",true);
-				startActivity(intent);
-				finish();
-			}
-		} else if (getIntent() != null && VIEW_CONVERSATION.equals(getIntent().getType())) {
-			handleViewConversationIntent(getIntent());
-		} else if (selectConversationByUuid(mOpenConverstaion)) {
-			if (mPanelOpen) {
-				showConversationsOverview();
-			} else {
-				if (isConversationsOverviewHideable()) {
-					openConversation();
-				}
-			}
-			this.mConversationFragment.reInit(getSelectedConversation());
-			mOpenConverstaion = null;
-		} else if (getSelectedConversation() != null) {
-			this.mConversationFragment.reInit(getSelectedConversation());
-		} else {
-			showConversationsOverview();
-			mPendingImageUri = null;
-			mPendingFileUri = null;
-			mPendingGeoUri = null;
-			setSelectedConversation(conversationList.get(0));
-			this.mConversationFragment.reInit(getSelectedConversation());
-		}
-
-		if (mPendingImageUri != null) {
-			attachImageToConversation(getSelectedConversation(),mPendingImageUri);
-			mPendingImageUri = null;
-		} else if (mPendingFileUri != null) {
-			attachFileToConversation(getSelectedConversation(),mPendingFileUri);
-			mPendingFileUri = null;
-		} else if (mPendingGeoUri != null) {
-			attachLocationToConversation(getSelectedConversation(),mPendingGeoUri);
-			mPendingGeoUri = null;
-		}
-		ExceptionHelper.checkForCrash(this, this.xmppConnectionService);
-		setIntent(new Intent());
-	}
-
-	private void handleViewConversationIntent(final Intent intent) {
-		final String uuid = (String) intent.getExtras().get(CONVERSATION);
-		final String downloadUuid = (String) intent.getExtras().get(MESSAGE);
-		final String text = intent.getExtras().getString(TEXT, "");
-		final String nick = intent.getExtras().getString(NICK, null);
-		if (selectConversationByUuid(uuid)) {
-			this.mConversationFragment.reInit(getSelectedConversation());
-			if (nick != null) {
-				this.mConversationFragment.highlightInConference(nick);
-			} else {
-				this.mConversationFragment.appendText(text);
-			}
-			hideConversationsOverview();
-			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) {
-					mConversationFragment.messageListAdapter.startDownloadable(message);
-				}
-			}
-		}
-	}
-
-	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(int requestCode, int resultCode,
-			final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (resultCode == RESULT_OK) {
-			if (requestCode == REQUEST_DECRYPT_PGP) {
-				mConversationFragment.hideSnackbar();
-				mConversationFragment.updateMessages();
-			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_IMAGE) {
-				mPendingImageUri = data.getData();
-				if (xmppConnectionServiceBound) {
-					attachImageToConversation(getSelectedConversation(),mPendingImageUri);
-					mPendingImageUri = null;
-				}
-			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) {
-				mPendingFileUri = data.getData();
-				if (xmppConnectionServiceBound) {
-					attachFileToConversation(getSelectedConversation(),mPendingFileUri);
-					mPendingFileUri = null;
-				}
-			} else if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO && mPendingImageUri != null) {
-				if (xmppConnectionServiceBound) {
-					attachImageToConversation(getSelectedConversation(),mPendingImageUri);
-					mPendingImageUri = null;
-				}
-				Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
-				intent.setData(mPendingImageUri);
-				sendBroadcast(intent);
-			} else if (requestCode == ATTACHMENT_CHOICE_LOCATION) {
-				double latitude = data.getDoubleExtra("latitude",0);
-				double longitude = data.getDoubleExtra("longitude",0);
-				this.mPendingGeoUri = Uri.parse("geo:"+String.valueOf(latitude)+","+String.valueOf(longitude));
-				if (xmppConnectionServiceBound) {
-					attachLocationToConversation(getSelectedConversation(), mPendingGeoUri);
-					this.mPendingGeoUri = null;
-				}
-			}
-		} else {
-			if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
-				mPendingImageUri = null;
-			}
-		}
-	}
-
-	private void attachLocationToConversation(Conversation conversation, Uri uri) {
-		xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() {
-
-			@Override
-			public void success(Message message) {
-				xmppConnectionService.sendMessage(message);
-			}
-
-			@Override
-			public void error(int errorCode, Message object) {
-
-			}
-
-			@Override
-			public void userInputRequried(PendingIntent pi, Message object) {
-
-			}
-		});
-	}
-
-	private void attachFileToConversation(Conversation conversation, Uri uri) {
-		prepareFileToast = Toast.makeText(getApplicationContext(),
-				getText(R.string.preparing_file), Toast.LENGTH_LONG);
-		prepareFileToast.show();
-		xmppConnectionService.attachFileToConversation(conversation,uri, new UiCallback<Message>() {
-			@Override
-			public void success(Message message) {
-				hidePrepareFileToast();
-				xmppConnectionService.sendMessage(message);
-			}
-
-			@Override
-			public void error(int errorCode, Message message) {
-				displayErrorDialog(errorCode);
-			}
-
-			@Override
-			public void userInputRequried(PendingIntent pi, Message message) {
-
-			}
-		});
-	}
-
-	private void attachImageToConversation(Conversation conversation, Uri uri) {
-		prepareFileToast = Toast.makeText(getApplicationContext(),
-				getText(R.string.preparing_image), Toast.LENGTH_LONG);
-		prepareFileToast.show();
-		xmppConnectionService.attachImageToConversation(conversation, uri,
-				new UiCallback<Message>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi,
-							Message object) {
-						hidePrepareFileToast();
-					}
-
-					@Override
-					public void success(Message message) {
-						xmppConnectionService.sendMessage(message);
-					}
-
-					@Override
-					public void error(int error, Message message) {
-						hidePrepareFileToast();
-						displayErrorDialog(error);
-					}
-				});
-	}
-
-	private void hidePrepareFileToast() {
-		if (prepareFileToast != null) {
-			runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-					prepareFileToast.cancel();
-				}
-			});
-		}
-	}
-
-	public void updateConversationList() {
-		xmppConnectionService
-			.populateWithOrderedConversations(conversationList);
-		listAdapter.notifyDataSetChanged();
-	}
-
-	public void runIntent(PendingIntent pi, int requestCode) {
-		try {
-			this.startIntentSenderForResult(pi.getIntentSender(), requestCode,
-					null, 0, 0, 0);
-		} catch (final SendIntentException ignored) {
-		}
-	}
-
-	public void encryptTextMessage(Message message) {
-		xmppConnectionService.getPgpEngine().encrypt(message,
-				new UiCallback<Message>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi,
-							Message message) {
-						ConversationActivity.this.runIntent(pi,
-								ConversationActivity.REQUEST_SEND_MESSAGE);
-					}
-
-					@Override
-					public void success(Message message) {
-						message.setEncryption(Message.ENCRYPTION_DECRYPTED);
-						xmppConnectionService.sendMessage(message);
-					}
-
-					@Override
-					public void error(int error, Message message) {
-
-					}
-				});
-	}
-
-	public boolean forceEncryption() {
-		return getPreferences().getBoolean("force_encryption", false);
-	}
-
-	public boolean indicateReceived() {
-		return getPreferences().getBoolean("indicate_received", false);
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		updateConversationList();
-		if (xmppConnectionService != null && xmppConnectionService.getAccounts().size() == 0) {
-			if (!mRedirected) {
-				this.mRedirected = true;
-				startActivity(new Intent(this, EditAccountActivity.class));
-				finish();
-			}
-		} else if (conversationList.size() == 0) {
-			if (!mRedirected) {
-				this.mRedirected = true;
-				Intent intent = new Intent(this, StartConversationActivity.class);
-				intent.putExtra("init",true);
-				startActivity(intent);
-				finish();
-			}
-		} else {
-			ConversationActivity.this.mConversationFragment.updateMessages();
-			updateActionBarTitle();
-		}
-	}
-
-	@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();
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				invalidateOptionsMenu();
-			}
-		});
-	}
-
-	public void unblockConversation(final Blockable conversation) {
-		xmppConnectionService.sendUnblockRequest(conversation);
-	}
-
-	public boolean enterIsSend() {
-		return getPreferences().getBoolean("enter_is_send",false);
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
deleted file mode 100644
index 4f359d9c..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ /dev/null
@@ -1,1187 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.IntentSender;
-import android.content.IntentSender.SendIntentException;
-import android.net.Uri;
-import android.os.Bundle;
-import android.text.InputType;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.Gravity;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AbsListView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.PopupWindow;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.TextView.OnEditorActionListener;
-import android.widget.Toast;
-
-import net.java.otr4j.session.SessionStatus;
-
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
-import de.tzur.conversations.Settings;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.crypto.PgpEngine;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Downloadable;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.entities.DownloadablePlaceholder;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.MucOptions;
-import eu.siacs.conversations.entities.Presences;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.ui.XmppActivity.OnPresenceSelected;
-import eu.siacs.conversations.ui.XmppActivity.OnValueEdited;
-import eu.siacs.conversations.ui.adapter.MessageAdapter;
-import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureClicked;
-import eu.siacs.conversations.ui.adapter.MessageAdapter.OnContactPictureLongClicked;
-import eu.siacs.conversations.utils.GeoHelper;
-import eu.siacs.conversations.xmpp.chatstate.ChatState;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import github.ankushsachdeva.emojicon.EmojiconEditText;
-import github.ankushsachdeva.emojicon.EmojiconGridView;
-import github.ankushsachdeva.emojicon.EmojiconsPopup;
-import github.ankushsachdeva.emojicon.emoji.Emojicon;
-
-public class ConversationFragment extends Fragment implements EditMessage.KeyboardListener {
-
-	protected Conversation conversation;
-	private OnClickListener leaveMuc = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			activity.endConversation(conversation);
-		}
-	};
-	private OnClickListener joinMuc = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			activity.xmppConnectionService.joinMuc(conversation);
-		}
-	};
-	private OnClickListener enterPassword = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			MucOptions muc = conversation.getMucOptions();
-			String password = muc.getPassword();
-			if (password == null) {
-				password = "";
-			}
-			activity.quickPasswordEdit(password, new OnValueEdited() {
-
-				@Override
-				public void onValueEdited(String value) {
-					activity.xmppConnectionService.providePasswordForMuc(
-							conversation, value);
-				}
-			});
-		}
-	};
-	protected ListView messagesView;
-	final protected List<Message> messageList = new ArrayList<>();
-	protected MessageAdapter messageListAdapter;
-	private EditMessage mEditMessage;
-	private ImageButton mSendButton;
-    private ImageView mEmojButton;
-    private View mRootView;
-    private EmojiconsPopup mEmojPopup;
-	private RelativeLayout snackbar;
-	private TextView snackbarMessage;
-	private TextView snackbarAction;
-	private boolean messagesLoaded = true;
-	private Toast messageLoaderToast;
-
-	private OnScrollListener mOnScrollListener = new OnScrollListener() {
-
-		@Override
-		public void onScrollStateChanged(AbsListView view, int scrollState) {
-			// TODO Auto-generated method stub
-
-		}
-
-		@Override
-		public void onScroll(AbsListView view, int firstVisibleItem,
-				int visibleItemCount, int totalItemCount) {
-			synchronized (ConversationFragment.this.messageList) {
-				if (firstVisibleItem < 5 && messagesLoaded && messageList.size() > 0) {
-					long timestamp = ConversationFragment.this.messageList.get(0).getTimeSent();
-					messagesLoaded = false;
-					activity.xmppConnectionService.loadMoreMessages(conversation, timestamp, new XmppConnectionService.OnMoreMessagesLoaded() {
-						@Override
-						public void onMoreMessagesLoaded(final int count, Conversation conversation) {
-							if (ConversationFragment.this.conversation != conversation) {
-								return;
-							}
-							activity.runOnUiThread(new Runnable() {
-								@Override
-								public void run() {
-									final int oldPosition = messagesView.getFirstVisiblePosition();
-									View v = messagesView.getChildAt(0);
-									final int pxOffset = (v == null) ? 0 : v.getTop();
-									ConversationFragment.this.conversation.populateWithMessages(ConversationFragment.this.messageList);
-									updateStatusMessages();
-									messageListAdapter.notifyDataSetChanged();
-									if (count != 0) {
-										final int newPosition = oldPosition + count;
-										int offset = 0;
-										try {
-											Message tmpMessage = messageList.get(newPosition);
-
-											while(tmpMessage.wasMergedIntoPrevious()) {
-												offset++;
-												tmpMessage = tmpMessage.prev();
-											}
-										} catch (final IndexOutOfBoundsException ignored) {
-
-										}
-										messagesView.setSelectionFromTop(newPosition - offset, pxOffset);
-										messagesLoaded = true;
-										if (messageLoaderToast != null) {
-											messageLoaderToast.cancel();
-										}
-									}
-								}
-							});
-						}
-
-						@Override
-						public void informUser(final int resId) {
-
-							activity.runOnUiThread(new Runnable() {
-								@Override
-								public void run() {
-									if (messageLoaderToast != null) {
-										messageLoaderToast.cancel();
-									}
-									if (ConversationFragment.this.conversation != conversation) {
-										return;
-									}
-									messageLoaderToast = Toast.makeText(activity,resId,Toast.LENGTH_LONG);
-									messageLoaderToast.show();
-								}
-							});
-
-						}
-					});
-
-				}
-			}
-		}
-	};
-	private IntentSender askForPassphraseIntent = null;
-	protected OnClickListener clickToDecryptListener = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			if (activity.hasPgp() && askForPassphraseIntent != null) {
-				try {
-					getActivity().startIntentSenderForResult(
-							askForPassphraseIntent,
-							ConversationActivity.REQUEST_DECRYPT_PGP, null, 0,
-							0, 0);
-					askForPassphraseIntent = null;
-				} catch (SendIntentException e) {
-					//
-				}
-			}
-		}
-	};
-	protected OnClickListener clickToVerify = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			activity.verifyOtrSessionDialog(conversation,v);
-		}
-	};
-	private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
-	private boolean mDecryptJobRunning = false;
-	private OnEditorActionListener mEditorActionListener = new OnEditorActionListener() {
-
-		@Override
-		public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
-			if (actionId == EditorInfo.IME_ACTION_SEND) {
-				InputMethodManager imm = (InputMethodManager) v.getContext()
-					.getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
-				sendMessage();
-				return true;
-			} else {
-				return false;
-			}
-		}
-	};
-	private OnClickListener mSendButtonListener = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			sendMessage();
-		}
-	};
-	private OnClickListener clickToMuc = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			Intent intent = new Intent(getActivity(),
-					ConferenceDetailsActivity.class);
-			intent.setAction(ConferenceDetailsActivity.ACTION_VIEW_MUC);
-			intent.putExtra("uuid", conversation.getUuid());
-			startActivity(intent);
-		}
-	};
-	private ConversationActivity activity;
-	private Message selectedMessage;
-
-	private void sendMessage() {
-		if (this.conversation == null) {
-			return;
-		}
-		if (mEditMessage.getText().length() < 1) {
-			if (this.conversation.getMode() == Conversation.MODE_MULTI) {
-				conversation.setNextCounterpart(null);
-				updateChatMsgHint();
-			}
-			return;
-		}
-		Message message = new Message(conversation, mEditMessage.getText()
-				.toString(), conversation.getNextEncryption(activity
-					.forceEncryption()));
-		if (conversation.getMode() == Conversation.MODE_MULTI) {
-			if (conversation.getNextCounterpart() != null) {
-				message.setCounterpart(conversation.getNextCounterpart());
-				message.setType(Message.TYPE_PRIVATE);
-				conversation.setNextCounterpart(null);
-			}
-		}
-		if (conversation.getNextEncryption(activity.forceEncryption()) == Message.ENCRYPTION_OTR) {
-			sendOtrMessage(message);
-		} else if (conversation.getNextEncryption(activity.forceEncryption()) == Message.ENCRYPTION_PGP) {
-			sendPgpMessage(message);
-		} else {
-			sendPlainTextMessage(message);
-		}
-	}
-
-	public void updateChatMsgHint() {
-		if (conversation.getMode() == Conversation.MODE_MULTI
-				&& conversation.getNextCounterpart() != null) {
-			this.mEditMessage.setHint(getString(
-						R.string.send_private_message_to,
-						conversation.getNextCounterpart().getResourcepart()));
-		} else {
-			switch (conversation.getNextEncryption(activity.forceEncryption())) {
-				case Message.ENCRYPTION_NONE:
-					mEditMessage
-						.setHint(getString(R.string.send_plain_text_message));
-					break;
-				case Message.ENCRYPTION_OTR:
-					mEditMessage.setHint(getString(R.string.send_otr_message));
-					break;
-				case Message.ENCRYPTION_PGP:
-					mEditMessage.setHint(getString(R.string.send_pgp_message));
-					break;
-				default:
-					break;
-			}
-			getActivity().invalidateOptionsMenu();
-		}
-	}
-
-	private void setupIme() {
-		if (((ConversationActivity)getActivity()).usingEnterKey()) {
-			mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
-		} else {
-			mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
-		}
-	}
-
-	@Override
-	public View onCreateView(final LayoutInflater inflater,
-			ViewGroup container, Bundle savedInstanceState) {
-		final View view = inflater.inflate(R.layout.fragment_conversation,
-				container, false);
-		mEditMessage = (EditMessage) view.findViewById(R.id.textinput);
-		setupIme();
-		mEditMessage.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				if (activity != null) {
-					activity.hideConversationsOverview();
-				}
-			}
-		});
-		mEditMessage.setOnEditorActionListener(mEditorActionListener);
-
-        // Start of emojicon
-        mEmojButton = (ImageView) view.findViewById(R.id.emoji_btn);
-        mRootView = view.findViewById(R.id.textsend);
-
-        // Give the topmost view of your activity layout hierarchy. This will be used to measure soft keyboard height
-        mEmojPopup = new EmojiconsPopup(mRootView, this.getActivity());
-
-        //Will automatically set size according to the soft keyboard size
-        mEmojPopup.setSizeForSoftKeyboard();
-
-        //Set on emojicon click listener
-        mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
-
-            @Override
-            public void onEmojiconClicked(Emojicon emojicon) {
-                mEditMessage.append(emojicon.getEmoji());
-            }
-        });
-
-        //Set on backspace click listener
-        mEmojPopup.setOnEmojiconBackspaceClickedListener(new EmojiconsPopup.OnEmojiconBackspaceClickedListener() {
-
-            @Override
-            public void onEmojiconBackspaceClicked(View v) {
-                KeyEvent event = new KeyEvent(
-                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
-                mEditMessage.dispatchKeyEvent(event);
-            }
-        });
-
-        //If the emoji popup is dismissed, change emojiButton to smiley icon
-        mEmojPopup.setOnDismissListener(new PopupWindow.OnDismissListener() {
-
-            @Override
-            public void onDismiss() {
-                changeEmojiKeyboardIcon(mEmojButton, R.drawable.smiley);
-            }
-        });
-
-        //If the text keyboard closes, also dismiss the emoji popup
-        mEmojPopup.setOnSoftKeyboardOpenCloseListener(new EmojiconsPopup.OnSoftKeyboardOpenCloseListener() {
-
-            @Override
-            public void onKeyboardOpen(int keyBoardHeight) {
-
-            }
-
-            @Override
-            public void onKeyboardClose() {
-                if (mEmojPopup.isShowing())
-                    mEmojPopup.dismiss();
-            }
-        });
-
-        //On emoji clicked, add it to edittext
-        mEmojPopup.setOnEmojiconClickedListener(new EmojiconGridView.OnEmojiconClickedListener() {
-
-            @Override
-            public void onEmojiconClicked(Emojicon emojicon) {
-                mEditMessage.append(emojicon.getEmoji());
-            }
-        });
-
-        //On backspace clicked, emulate the KEYCODE_DEL key event
-        mEmojPopup.setOnEmojiconBackspaceClickedListener(new EmojiconsPopup.OnEmojiconBackspaceClickedListener() {
-
-            @Override
-            public void onEmojiconBackspaceClicked(View v) {
-                KeyEvent event = new KeyEvent(
-                        0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
-                mEditMessage.dispatchKeyEvent(event);
-            }
-        });
-
-        // To toggle between text keyboard and emoji keyboard keyboard(Popup)
-        mEmojButton.setOnClickListener(new OnClickListener() {
-
-            @Override
-            public void onClick(View v) {
-
-                //If popup is not showing => emoji keyboard is not visible, we need to show it
-                if(!mEmojPopup.isShowing()){
-
-                    //If keyboard is visible, simply show the emoji popup
-                    if(mEmojPopup.isKeyBoardOpen()){
-                        mEmojPopup.showAtBottom();
-                        changeEmojiKeyboardIcon(mEmojButton, R.drawable.ic_action_keyboard);
-                    }
-
-                    //else, open the text keyboard first and immediately after that show the emoji popup
-                    else{
-                        mEditMessage.setFocusableInTouchMode(true);
-                        mEditMessage.requestFocus();
-                        mEmojPopup.showAtBottomPending();
-                        final InputMethodManager inputMethodManager = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-                        inputMethodManager.showSoftInput(mEditMessage, InputMethodManager.SHOW_IMPLICIT);
-                        changeEmojiKeyboardIcon(mEmojButton, R.drawable.ic_action_keyboard);
-                    }
-                }
-
-                //If popup is showing, simply dismiss it to show the undelying text keyboard
-                else{
-                    mEmojPopup.dismiss();
-                }
-            }
-        });
-
-        // End of emojicon
-
-		mSendButton = (ImageButton) view.findViewById(R.id.textSendButton);
-		mSendButton.setOnClickListener(this.mSendButtonListener);
-
-		snackbar = (RelativeLayout) view.findViewById(R.id.snackbar);
-		snackbarMessage = (TextView) view.findViewById(R.id.snackbar_message);
-		snackbarAction = (TextView) view.findViewById(R.id.snackbar_action);
-
-		messagesView = (ListView) view.findViewById(R.id.messages_view);
-		messagesView.setOnScrollListener(mOnScrollListener);
-		messagesView.setTranscriptMode(ListView.TRANSCRIPT_MODE_NORMAL);
-		messageListAdapter = new MessageAdapter((ConversationActivity) getActivity(), this.messageList);
-		messageListAdapter.setOnContactPictureClicked(new OnContactPictureClicked() {
-
-			@Override
-			public void onContactPictureClicked(Message message) {
-				if (message.getStatus() <= Message.STATUS_RECEIVED) {
-					if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
-						if (message.getCounterpart() != null) {
-							if (!message.getCounterpart().isBareJid()) {
-								highlightInConference(message.getCounterpart().getResourcepart());
-							} else {
-								highlightInConference(message.getCounterpart().toString());
-							}
-						}
-					} else {
-						activity.switchToContactDetails(message.getContact());
-					}
-				} else {
-					Account account = message.getConversation().getAccount();
-					Intent intent = new Intent(activity, EditAccountActivity.class);
-					intent.putExtra("jid", account.getJid().toBareJid().toString());
-					startActivity(intent);
-				}
-			}
-		});
-		messageListAdapter
-			.setOnContactPictureLongClicked(new OnContactPictureLongClicked() {
-
-				@Override
-				public void onContactPictureLongClicked(Message message) {
-					if (message.getStatus() <= Message.STATUS_RECEIVED) {
-						if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
-							if (message.getCounterpart() != null) {
-								privateMessageWith(message.getCounterpart());
-							}
-						}
-					} else {
-						activity.showQrCode();
-					}
-				}
-			});
-		messagesView.setAdapter(messageListAdapter);
-
-		registerForContextMenu(messagesView);
-
-		return view;
-	}
-
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v,
-			ContextMenuInfo menuInfo) {
-		synchronized (this.messageList) {
-			super.onCreateContextMenu(menu, v, menuInfo);
-			AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
-			this.selectedMessage = this.messageList.get(acmi.position);
-			populateContextMenu(menu);
-		}
-	}
-
-	private void populateContextMenu(ContextMenu menu) {
-		final Message m = this.selectedMessage;
-		if (m.getType() != Message.TYPE_STATUS) {
-			activity.getMenuInflater().inflate(R.menu.message_context, menu);
-			menu.setHeaderTitle(R.string.message_options);
-			MenuItem copyText = menu.findItem(R.id.copy_text);
-			MenuItem shareWith = menu.findItem(R.id.share_with);
-			MenuItem sendAgain = menu.findItem(R.id.send_again);
-			MenuItem copyUrl = menu.findItem(R.id.copy_url);
-			MenuItem downloadImage = menu.findItem(R.id.download_image);
-			MenuItem cancelTransmission = menu.findItem(R.id.cancel_transmission);
-			if ((m.getType() != Message.TYPE_TEXT && m.getType() != Message.TYPE_PRIVATE)
-					|| m.getDownloadable() != null || GeoHelper.isGeoUri(m.getBody())) {
-				copyText.setVisible(false);
-			}
-			if ((m.getType() == Message.TYPE_TEXT
-					|| m.getType() == Message.TYPE_PRIVATE
-					|| m.getDownloadable() != null)
-				&& (!GeoHelper.isGeoUri(m.getBody()))) {
-				shareWith.setVisible(false);
-			}
-			if (m.getStatus() != Message.STATUS_SEND_FAILED) {
-				sendAgain.setVisible(false);
-			}
-			if (((m.getType() != Message.TYPE_IMAGE && m.getDownloadable() == null)
-					|| m.getImageParams().url == null) && !GeoHelper.isGeoUri(m.getBody())) {
-				copyUrl.setVisible(false);
-					}
-			if (m.getType() != Message.TYPE_TEXT
-					|| m.getDownloadable() != null
-					|| !m.bodyContainsDownloadable()) {
-				downloadImage.setVisible(false);
-					}
-			if (!((m.getDownloadable() != null && !(m.getDownloadable() instanceof DownloadablePlaceholder))
-						|| (m.isFileOrImage() && (m.getStatus() == Message.STATUS_WAITING
-								|| m.getStatus() == Message.STATUS_OFFERED)))) {
-				cancelTransmission.setVisible(false);
-								}
-		}
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.share_with:
-				shareWith(selectedMessage);
-				return true;
-			case R.id.copy_text:
-				copyText(selectedMessage);
-				return true;
-			case R.id.send_again:
-				resendMessage(selectedMessage);
-				return true;
-			case R.id.copy_url:
-				copyUrl(selectedMessage);
-				return true;
-			case R.id.download_image:
-				downloadImage(selectedMessage);
-				return true;
-			case R.id.cancel_transmission:
-				cancelTransmission(selectedMessage);
-				return true;
-			default:
-				return super.onContextItemSelected(item);
-		}
-	}
-
-	private void shareWith(Message message) {
-		Intent shareIntent = new Intent();
-		shareIntent.setAction(Intent.ACTION_SEND);
-		if (GeoHelper.isGeoUri(message.getBody())) {
-			shareIntent.putExtra(Intent.EXTRA_TEXT, message.getBody());
-			shareIntent.setType("text/plain");
-		} else {
-			shareIntent.putExtra(Intent.EXTRA_STREAM,
-					activity.xmppConnectionService.getFileBackend()
-							.getJingleFileUri(message));
-			shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-			String path = message.getRelativeFilePath();
-			String mime = path == null ? null : URLConnection.guessContentTypeFromName(path);
-			if (mime == null) {
-				mime = "image/webp";
-			}
-			shareIntent.setType(mime);
-		}
-		activity.startActivity(Intent.createChooser(shareIntent,getText(R.string.share_with)));
-	}
-
-	private void copyText(Message message) {
-		if (activity.copyTextToClipboard(message.getMergedBody(),
-					R.string.message_text)) {
-			Toast.makeText(activity, R.string.message_copied_to_clipboard,
-					Toast.LENGTH_SHORT).show();
-		}
-	}
-
-	private void resendMessage(Message message) {
-		if (message.getType() == Message.TYPE_FILE || message.getType() == Message.TYPE_IMAGE) {
-			DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
-			if (!file.exists()) {
-				Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
-				message.setDownloadable(new DownloadablePlaceholder(Downloadable.STATUS_DELETED));
-				return;
-			}
-		}
-		activity.xmppConnectionService.resendFailedMessages(message);
-	}
-
-	private void copyUrl(Message message) {
-		final String url;
-		final int resId;
-		if (GeoHelper.isGeoUri(message.getBody())) {
-			resId = R.string.location;
-			url = message.getBody();
-		} else {
-			resId = R.string.image_url;
-			url = message.getImageParams().url.toString();
-		}
-		if (activity.copyTextToClipboard(url, resId)) {
-			Toast.makeText(activity, R.string.url_copied_to_clipboard,
-					Toast.LENGTH_SHORT).show();
-					}
-	}
-
-	private void downloadImage(Message message) {
-		activity.xmppConnectionService.getHttpConnectionManager()
-			.createNewConnection(message);
-	}
-
-	private void cancelTransmission(Message message) {
-		Downloadable downloadable = message.getDownloadable();
-		if (downloadable!=null) {
-			downloadable.cancel();
-		} else {
-			activity.xmppConnectionService.markMessage(message,Message.STATUS_SEND_FAILED);
-		}
-	}
-
-	protected void privateMessageWith(final Jid counterpart) {
-		this.mEditMessage.setText("");
-		this.conversation.setNextCounterpart(counterpart);
-		updateChatMsgHint();
-	}
-
-	protected void highlightInConference(String nick) {
-		String oldString = mEditMessage.getText().toString();
-		if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) {
-			mEditMessage.getText().insert(0, nick + ": ");
-		} else {
-			if (mEditMessage.getText().charAt(
-						mEditMessage.getSelectionStart() - 1) != ' ') {
-				nick = " " + nick;
-						}
-			mEditMessage.getText().insert(mEditMessage.getSelectionStart(),
-					nick + " ");
-		}
-	}
-
-	@Override
-	public void onStop() {
-		mDecryptJobRunning = false;
-		super.onStop();
-		if (this.conversation != null) {
-			final String msg = mEditMessage.getText().toString();
-			this.conversation.setNextMessage(msg);
-			updateChatState(this.conversation,msg);
-		}
-	}
-
-	private void updateChatState(final Conversation conversation, final String msg) {
-		ChatState state = msg.length() == 0 ? Config.DEFAULT_CHATSTATE : ChatState.PAUSED;
-		Account.State status = conversation.getAccount().getStatus();
-		if (status == Account.State.ONLINE && conversation.setOutgoingChatState(state)) {
-			activity.xmppConnectionService.sendChatState(conversation);
-		}
-	}
-
-	public void reInit(Conversation conversation) {
-		if (conversation == null) {
-			return;
-		}
-
-		this.activity = (ConversationActivity) getActivity();
-
-		if (this.conversation != null) {
-			final String msg = mEditMessage.getText().toString();
-			this.conversation.setNextMessage(msg);
-			if (this.conversation != conversation) {
-				updateChatState(this.conversation,msg);
-			}
-			this.conversation.trim();
-		}
-
-		this.askForPassphraseIntent = null;
-		this.conversation = conversation;
-		this.mDecryptJobRunning = false;
-		this.mEncryptedMessages.clear();
-		if (this.conversation.getMode() == Conversation.MODE_MULTI) {
-			this.conversation.setNextCounterpart(null);
-		}
-		this.mEditMessage.setKeyboardListener(null);
-		this.mEditMessage.setText("");
-		this.mEditMessage.append(this.conversation.getNextMessage());
-		this.mEditMessage.setKeyboardListener(this);
-		this.messagesView.setAdapter(messageListAdapter);
-		updateMessages();
-		this.messagesLoaded = true;
-		int size = this.messageList.size();
-		if (size > 0) {
-			messagesView.setSelection(size - 1);
-		}
-	}
-
-	private OnClickListener mUnblockClickListener = new OnClickListener() {
-		@Override
-		public void onClick(final View v) {
-			v.post(new Runnable() {
-				@Override
-				public void run() {
-					v.setVisibility(View.INVISIBLE);
-				}
-			});
-			if (conversation.isDomainBlocked()) {
-				BlockContactDialog.show(activity, activity.xmppConnectionService, conversation);
-			} else {
-				activity.unblockConversation(conversation);
-			}
-		}
-	};
-
-	private OnClickListener mAddBackClickListener = new OnClickListener() {
-
-		@Override
-		public void onClick(View v) {
-			final Contact contact = conversation == null ? null :conversation.getContact();
-			if (contact != null) {
-				activity.xmppConnectionService.createContact(contact);
-				activity.switchToContactDetails(contact);
-			}
-		}
-	};
-
-	private OnClickListener mUnmuteClickListener = new OnClickListener() {
-
-		@Override
-		public void onClick(final View v) {
-			activity.unmuteConversation(conversation);
-		}
-	};
-
-	private OnClickListener mAnswerSmpClickListener = new OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			Intent intent = new Intent(activity, VerifyOTRActivity.class);
-			intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
-			intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
-			intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
-			intent.putExtra("mode",VerifyOTRActivity.MODE_ANSWER_QUESTION);
-			startActivity(intent);
-		}
-	};
-
-	private void updateSnackBar(final Conversation conversation) {
-		final Account account = conversation.getAccount();
-		final Contact contact = conversation.getContact();
-		final int mode = conversation.getMode();
-		if (conversation.isBlocked()) {
-			showSnackbar(R.string.contact_blocked, R.string.unblock,this.mUnblockClickListener);
-		} else if (!contact.showInRoster() && contact.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-			showSnackbar(R.string.contact_added_you, R.string.add_back,this.mAddBackClickListener);
-		} else if (mode == Conversation.MODE_MULTI
-				&&!conversation.getMucOptions().online()
-				&& account.getStatus() == Account.State.ONLINE) {
-			switch (conversation.getMucOptions().getError()) {
-				case MucOptions.ERROR_NICK_IN_USE:
-					showSnackbar(R.string.nick_in_use, R.string.edit, clickToMuc);
-					break;
-				case MucOptions.ERROR_UNKNOWN:
-					showSnackbar(R.string.conference_not_found, R.string.leave, leaveMuc);
-					break;
-				case MucOptions.ERROR_PASSWORD_REQUIRED:
-					showSnackbar(R.string.conference_requires_password, R.string.enter_password, enterPassword);
-					break;
-				case MucOptions.ERROR_BANNED:
-					showSnackbar(R.string.conference_banned, R.string.leave, leaveMuc);
-					break;
-				case MucOptions.ERROR_MEMBERS_ONLY:
-					showSnackbar(R.string.conference_members_only, R.string.leave, leaveMuc);
-					break;
-				case MucOptions.KICKED_FROM_ROOM:
-					showSnackbar(R.string.conference_kicked, R.string.join, joinMuc);
-					break;
-				default:
-					break;
-			}
-		} else if (askForPassphraseIntent != null ) {
-			showSnackbar(R.string.openpgp_messages_found,R.string.decrypt, clickToDecryptListener);
-		} else if (mode == Conversation.MODE_SINGLE
-				&& conversation.smpRequested()) {
-			showSnackbar(R.string.smp_requested, R.string.verify,this.mAnswerSmpClickListener);
-		} else if (mode == Conversation.MODE_SINGLE
-				&&conversation.hasValidOtrSession()
-				&& (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
-				&& (!conversation.isOtrFingerprintVerified())) {
-			showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);
-		} else if (conversation.isMuted()) {
-			showSnackbar(R.string.notifications_disabled, R.string.enable,this.mUnmuteClickListener);
-		} else {
-			hideSnackbar();
-		}
-	}
-
-	public void updateMessages() {
-		synchronized (this.messageList) {
-			if (getView() == null) {
-				return;
-			}
-			final ConversationActivity activity = (ConversationActivity) getActivity();
-			if (this.conversation != null) {
-				updateSnackBar(this.conversation);
-				final Contact contact = this.conversation.getContact();
-				if (this.conversation.isBlocked()) {
-
-				} else if (!contact.showInRoster()
-						&& contact
-						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
-
-				} else if (conversation.getMode() == Conversation.MODE_SINGLE) {
-					makeFingerprintWarning();
-				} else if (!conversation.getMucOptions().online()
-						&& conversation.getAccount().getStatus() == Account.State.ONLINE) {
-
-				} else if (this.conversation.isMuted()) {
-
-				}
-				conversation.populateWithMessages(ConversationFragment.this.messageList);
-				for (final Message message : this.messageList) {
-					if (message.getEncryption() == Message.ENCRYPTION_PGP
-							&& (message.getStatus() == Message.STATUS_RECEIVED || message
-								.getStatus() >= Message.STATUS_SEND)
-							&& message.getDownloadable() == null) {
-						if (!mEncryptedMessages.contains(message)) {
-							mEncryptedMessages.add(message);
-						}
-							}
-				}
-				decryptNext();
-				updateStatusMessages();
-				this.messageListAdapter.notifyDataSetChanged();
-				updateChatMsgHint();
-				if (!activity.isConversationsOverviewVisable() || !activity.isConversationsOverviewHideable()) {
-					activity.sendReadMarkerIfNecessary(conversation);
-				}
-				this.updateSendButton();
-			}
-		}
-	}
-
-	private void decryptNext() {
-		Message next = this.mEncryptedMessages.peek();
-		PgpEngine engine = activity.xmppConnectionService.getPgpEngine();
-
-		if (next != null && engine != null && !mDecryptJobRunning) {
-			mDecryptJobRunning = true;
-			engine.decrypt(next, new UiCallback<Message>() {
-
-				@Override
-				public void userInputRequried(PendingIntent pi, Message message) {
-					mDecryptJobRunning = false;
-					askForPassphraseIntent = pi.getIntentSender();
-					updateSnackBar(conversation);
-				}
-
-				@Override
-				public void success(Message message) {
-					mDecryptJobRunning = false;
-					try {
-						mEncryptedMessages.remove();
-					} catch (final NoSuchElementException ignored) {
-
-					}
-					activity.xmppConnectionService.updateMessage(message);
-				}
-
-				@Override
-				public void error(int error, Message message) {
-					message.setEncryption(Message.ENCRYPTION_DECRYPTION_FAILED);
-					mDecryptJobRunning = false;
-					try {
-						mEncryptedMessages.remove();
-					} catch (final NoSuchElementException ignored) {
-
-					}
-					activity.xmppConnectionService.updateConversationUi();
-				}
-			});
-		}
-	}
-
-	private void messageSent() {
-		int size = this.messageList.size();
-		messagesView.setSelection(size - 1);
-		mEditMessage.setText("");
-		updateChatMsgHint();
-	}
-
-	public void updateSendButton() {
-		Conversation c = this.conversation;
-		if (Settings.SHOW_ONLINE_STATUS && c != null
-				&& c.getAccount().getStatus() == Account.State.ONLINE) {
-			if (c.getMode() == Conversation.MODE_SINGLE) {
-				switch (c.getContact().getMostAvailableStatus()) {
-					case Presences.CHAT:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_online);
-						break;
-					case Presences.ONLINE:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_online);
-						break;
-					case Presences.AWAY:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_away);
-						break;
-					case Presences.XA:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_away);
-						break;
-					case Presences.DND:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_dnd);
-						break;
-					default:
-						this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_offline);
-						break;
-				}
-			} else if (c.getMode() == Conversation.MODE_MULTI) {
-				if (c.getMucOptions().online()) {
-					this.mSendButton
-						.setImageResource(R.drawable.ic_action_send_now_online);
-				} else {
-					this.mSendButton
-						.setImageResource(R.drawable.ic_action_send_now_offline);
-				}
-			} else {
-				this.mSendButton
-					.setImageResource(R.drawable.ic_action_send_now_offline);
-			}
-		} else {
-			this.mSendButton
-				.setImageResource(R.drawable.ic_action_send_now_offline);
-		}
-	}
-
-	protected void updateStatusMessages() {
-		synchronized (this.messageList) {
-			if (conversation.getMode() == Conversation.MODE_SINGLE) {
-				ChatState state = conversation.getIncomingChatState();
-				if (state == ChatState.COMPOSING) {
-					this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_is_typing, conversation.getName())));
-				} else if (state == ChatState.PAUSED) {
-					this.messageList.add(Message.createStatusMessage(conversation, getString(R.string.contact_has_stopped_typing, conversation.getName())));
-				} else {
-					for (int i = this.messageList.size() - 1; i >= 0; --i) {
-						if (this.messageList.get(i).getStatus() == Message.STATUS_RECEIVED) {
-							return;
-						} else {
-							if (this.messageList.get(i).getStatus() == Message.STATUS_SEND_DISPLAYED) {
-								this.messageList.add(i + 1,
-										Message.createStatusMessage(conversation, getString(R.string.contact_has_read_up_to_this_point, conversation.getName())));
-								return;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-	protected void makeFingerprintWarning() {
-
-	}
-
-	protected void showSnackbar(final int message, final int action,
-			final OnClickListener clickListener) {
-		snackbar.setVisibility(View.VISIBLE);
-		snackbar.setOnClickListener(null);
-		snackbarMessage.setText(message);
-		snackbarMessage.setOnClickListener(null);
-		snackbarAction.setVisibility(View.VISIBLE);
-		snackbarAction.setText(action);
-		snackbarAction.setOnClickListener(clickListener);
-	}
-
-	protected void hideSnackbar() {
-		snackbar.setVisibility(View.GONE);
-	}
-
-	protected void sendPlainTextMessage(Message message) {
-		ConversationActivity activity = (ConversationActivity) getActivity();
-		activity.xmppConnectionService.sendMessage(message);
-		messageSent();
-	}
-
-	protected void sendPgpMessage(final Message message) {
-		final ConversationActivity activity = (ConversationActivity) getActivity();
-		final XmppConnectionService xmppService = activity.xmppConnectionService;
-		final Contact contact = message.getConversation().getContact();
-		if (activity.hasPgp()) {
-			if (conversation.getMode() == Conversation.MODE_SINGLE) {
-				if (contact.getPgpKeyId() != 0) {
-					xmppService.getPgpEngine().hasKey(contact,
-							new UiCallback<Contact>() {
-
-								@Override
-								public void userInputRequried(PendingIntent pi,
-										Contact contact) {
-									activity.runIntent(
-											pi,
-											ConversationActivity.REQUEST_ENCRYPT_MESSAGE);
-								}
-
-								@Override
-								public void success(Contact contact) {
-									messageSent();
-									activity.encryptTextMessage(message);
-								}
-
-								@Override
-								public void error(int error, Contact contact) {
-
-								}
-							});
-
-				} else {
-					showNoPGPKeyDialog(false,
-							new DialogInterface.OnClickListener() {
-
-								@Override
-								public void onClick(DialogInterface dialog,
-										int which) {
-									conversation
-										.setNextEncryption(Message.ENCRYPTION_NONE);
-									xmppService.databaseBackend
-										.updateConversation(conversation);
-									message.setEncryption(Message.ENCRYPTION_NONE);
-									xmppService.sendMessage(message);
-									messageSent();
-								}
-							});
-				}
-			} else {
-				if (conversation.getMucOptions().pgpKeysInUse()) {
-					if (!conversation.getMucOptions().everybodyHasKeys()) {
-						Toast warning = Toast
-							.makeText(getActivity(),
-									R.string.missing_public_keys,
-									Toast.LENGTH_LONG);
-						warning.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
-						warning.show();
-					}
-					activity.encryptTextMessage(message);
-					messageSent();
-				} else {
-					showNoPGPKeyDialog(true,
-							new DialogInterface.OnClickListener() {
-
-								@Override
-								public void onClick(DialogInterface dialog,
-										int which) {
-									conversation
-										.setNextEncryption(Message.ENCRYPTION_NONE);
-									message.setEncryption(Message.ENCRYPTION_NONE);
-									xmppService.databaseBackend
-										.updateConversation(conversation);
-									xmppService.sendMessage(message);
-									messageSent();
-								}
-							});
-				}
-			}
-		} else {
-			activity.showInstallPgpDialog();
-		}
-	}
-
-	public void showNoPGPKeyDialog(boolean plural,
-			DialogInterface.OnClickListener listener) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-		builder.setIconAttribute(android.R.attr.alertDialogIcon);
-		if (plural) {
-			builder.setTitle(getString(R.string.no_pgp_keys));
-			builder.setMessage(getText(R.string.contacts_have_no_pgp_keys));
-		} else {
-			builder.setTitle(getString(R.string.no_pgp_key));
-			builder.setMessage(getText(R.string.contact_has_no_pgp_key));
-		}
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setPositiveButton(getString(R.string.send_unencrypted),
-				listener);
-		builder.create().show();
-	}
-
-	protected void sendOtrMessage(final Message message) {
-		final ConversationActivity activity = (ConversationActivity) getActivity();
-		final XmppConnectionService xmppService = activity.xmppConnectionService;
-		activity.selectPresence(message.getConversation(),
-                new OnPresenceSelected() {
-
-                    @Override
-                    public void onPresenceSelected() {
-                        message.setCounterpart(conversation.getNextCounterpart());
-                        xmppService.sendMessage(message);
-                        messageSent();
-                    }
-                });
-	}
-
-	public void appendText(String text) {
-		String previous = this.mEditMessage.getText().toString();
-		if (previous.length() != 0 && !previous.endsWith(" ")) {
-			text = " " + text;
-		}
-		this.mEditMessage.append(text);
-	}
-
-	@Override
-	public boolean onEnterPressed() {
-		if (activity.enterIsSend()) {
-			sendMessage();
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public void onTypingStarted() {
-		Account.State status = conversation.getAccount().getStatus();
-		if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.COMPOSING)) {
-			activity.xmppConnectionService.sendChatState(conversation);
-		}
-	}
-
-	@Override
-	public void onTypingStopped() {
-		Account.State status = conversation.getAccount().getStatus();
-		if (status == Account.State.ONLINE && conversation.setOutgoingChatState(ChatState.PAUSED)) {
-			activity.xmppConnectionService.sendChatState(conversation);
-		}
-	}
-
-	@Override
-	public void onTextDeleted() {
-		Account.State status = conversation.getAccount().getStatus();
-		if (status == Account.State.ONLINE && conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
-			activity.xmppConnectionService.sendChatState(conversation);
-		}
-	}
-
-    private void changeEmojiKeyboardIcon(ImageView iconToBeChanged, int drawableResourceId){
-        iconToBeChanged.setImageResource(drawableResourceId);
-    }
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
deleted file mode 100644
index 27dfc492..00000000
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ /dev/null
@@ -1,505 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.os.Bundle;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.AutoCompleteTextView;
-import android.widget.Button;
-import android.widget.CheckBox;
-import android.widget.CompoundButton;
-import android.widget.CompoundButton.OnCheckedChangeListener;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TableLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
-import eu.siacs.conversations.ui.adapter.KnownHostsAdapter;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.XmppConnection.Features;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.pep.Avatar;
-
-public class EditAccountActivity extends XmppActivity implements OnAccountUpdate{
-
-	private AutoCompleteTextView mAccountJid;
-	private EditText mPassword;
-	private EditText mPasswordConfirm;
-	private CheckBox mRegisterNew;
-	private Button mCancelButton;
-	private Button mSaveButton;
-	private TableLayout mMoreTable;
-
-	private LinearLayout mStats;
-	private TextView mServerInfoSm;
-	private TextView mServerInfoRosterVersion;
-	private TextView mServerInfoCarbons;
-	private TextView mServerInfoMam;
-	private TextView mServerInfoCSI;
-	private TextView mServerInfoBlocking;
-	private TextView mServerInfoPep;
-	private TextView mSessionEst;
-	private TextView mOtrFingerprint;
-	private ImageView mAvatar;
-	private RelativeLayout mOtrFingerprintBox;
-	private ImageButton mOtrFingerprintToClipboardButton;
-
-	private Jid jidToEdit;
-	private Account mAccount;
-
-	private boolean mFetchingAvatar = false;
-
-	private final OnClickListener mSaveButtonClickListener = new OnClickListener() {
-
-		@Override
-		public void onClick(final View v) {
-			if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED) {
-				mAccount.setOption(Account.OPTION_DISABLED, false);
-				xmppConnectionService.updateAccount(mAccount);
-				return;
-			}
-			final boolean registerNewAccount = mRegisterNew.isChecked();
-			final Jid jid;
-			try {
-				jid = Jid.fromString(mAccountJid.getText().toString());
-			} catch (final InvalidJidException e) {
-				mAccountJid.setError(getString(R.string.invalid_jid));
-				mAccountJid.requestFocus();
-				return;
-			}
-			if (jid.isDomainJid()) {
-				mAccountJid.setError(getString(R.string.invalid_jid));
-				mAccountJid.requestFocus();
-				return;
-			}
-			final String password = mPassword.getText().toString();
-			final String passwordConfirm = mPasswordConfirm.getText().toString();
-			if (registerNewAccount) {
-				if (!password.equals(passwordConfirm)) {
-					mPasswordConfirm.setError(getString(R.string.passwords_do_not_match));
-					mPasswordConfirm.requestFocus();
-					return;
-				}
-			}
-			if (mAccount != null) {
-				try {
-					mAccount.setUsername(jid.hasLocalpart() ? jid.getLocalpart() : "");
-					mAccount.setServer(jid.getDomainpart());
-				} catch (final InvalidJidException ignored) {
-					return;
-				}
-				mAccountJid.setError(null);
-				mPasswordConfirm.setError(null);
-				mAccount.setPassword(password);
-				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
-				xmppConnectionService.updateAccount(mAccount);
-			} else {
-				try {
-					if (xmppConnectionService.findAccountByJid(Jid.fromString(mAccountJid.getText().toString())) != null) {
-						mAccountJid.setError(getString(R.string.account_already_exists));
-						mAccountJid.requestFocus();
-						return;
-					}
-				} catch (final InvalidJidException e) {
-					return;
-				}
-				mAccount = new Account(jid.toBareJid(), password);
-				mAccount.setOption(Account.OPTION_USETLS, true);
-				mAccount.setOption(Account.OPTION_USECOMPRESSION, true);
-				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
-				xmppConnectionService.createAccount(mAccount);
-			}
-			if (jidToEdit != null) {
-				finish();
-			} else {
-				updateSaveButton();
-				updateAccountInformation();
-			}
-
-		}
-	};
-	private final OnClickListener mCancelButtonClickListener = new OnClickListener() {
-
-		@Override
-		public void onClick(final View v) {
-			finish();
-		}
-	};
-	@Override
-	public void onAccountUpdate() {
-		runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				invalidateOptionsMenu();
-				if (mAccount != null
-						&& mAccount.getStatus() != Account.State.ONLINE
-						&& mFetchingAvatar) {
-					startActivity(new Intent(getApplicationContext(),
-								ManageAccountActivity.class));
-					finish();
-				} else if (jidToEdit == null && mAccount != null
-						&& mAccount.getStatus() == Account.State.ONLINE) {
-					if (!mFetchingAvatar) {
-						mFetchingAvatar = true;
-						xmppConnectionService.checkForAvatar(mAccount,
-								mAvatarFetchCallback);
-					}
-				} else {
-					updateSaveButton();
-				}
-				if (mAccount != null) {
-					updateAccountInformation();
-				}
-			}
-		});
-	}
-	private final UiCallback<Avatar> mAvatarFetchCallback = new UiCallback<Avatar>() {
-
-		@Override
-		public void userInputRequried(final PendingIntent pi, final Avatar avatar) {
-			finishInitialSetup(avatar);
-		}
-
-		@Override
-		public void success(final Avatar avatar) {
-			finishInitialSetup(avatar);
-		}
-
-		@Override
-		public void error(final int errorCode, final Avatar avatar) {
-			finishInitialSetup(avatar);
-		}
-	};
-	private final TextWatcher mTextWatcher = new TextWatcher() {
-
-		@Override
-		public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
-			updateSaveButton();
-		}
-
-		@Override
-		public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
-		}
-
-		@Override
-		public void afterTextChanged(final Editable s) {
-
-		}
-	};
-
-	private final OnClickListener mAvatarClickListener = new OnClickListener() {
-		@Override
-		public void onClick(final View view) {
-			if (mAccount != null) {
-				final Intent intent = new Intent(getApplicationContext(),
-						PublishProfilePictureActivity.class);
-				intent.putExtra("account", mAccount.getJid().toBareJid().toString());
-				startActivity(intent);
-			}
-		}
-	};
-
-	protected void finishInitialSetup(final Avatar avatar) {
-		runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				final Intent intent;
-				if (avatar != null) {
-					intent = new Intent(getApplicationContext(),
-							StartConversationActivity.class);
-					intent.putExtra("init",true);
-				} else {
-					intent = new Intent(getApplicationContext(),
-							PublishProfilePictureActivity.class);
-					intent.putExtra("account", mAccount.getJid().toBareJid().toString());
-					intent.putExtra("setup", true);
-				}
-				startActivity(intent);
-				finish();
-			}
-		});
-	}
-
-	protected void updateSaveButton() {
-		if (mAccount != null && (mAccount.getStatus() == Account.State.CONNECTING || mFetchingAvatar)) {
-			this.mSaveButton.setEnabled(false);
-			this.mSaveButton.setTextColor(getSecondaryTextColor());
-			this.mSaveButton.setText(R.string.account_status_connecting);
-		} else if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED) {
-			this.mSaveButton.setEnabled(true);
-			this.mSaveButton.setTextColor(getPrimaryTextColor());
-			this.mSaveButton.setText(R.string.enable);
-		} else {
-			this.mSaveButton.setEnabled(true);
-			this.mSaveButton.setTextColor(getPrimaryTextColor());
-			if (jidToEdit != null) {
-				if (mAccount != null && mAccount.isOnlineAndConnected()) {
-					this.mSaveButton.setText(R.string.save);
-					if (!accountInfoEdited()) {
-						this.mSaveButton.setEnabled(false);
-						this.mSaveButton.setTextColor(getSecondaryTextColor());
-					}
-				} else {
-					this.mSaveButton.setText(R.string.connect);
-				}
-			} else {
-				this.mSaveButton.setText(R.string.next);
-			}
-		}
-	}
-
-	protected boolean accountInfoEdited() {
-		return (!this.mAccount.getJid().toBareJid().toString().equals(
-					this.mAccountJid.getText().toString()))
-			|| (!this.mAccount.getPassword().equals(
-						this.mPassword.getText().toString()));
-	}
-
-	@Override
-	protected String getShareableUri() {
-		if (mAccount!=null) {
-			return mAccount.getShareableUri();
-		} else {
-			return "";
-		}
-	}
-
-	@Override
-	protected void onCreate(final Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_edit_account);
-		this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid);
-		this.mAccountJid.addTextChangedListener(this.mTextWatcher);
-		this.mPassword = (EditText) findViewById(R.id.account_password);
-		this.mPassword.addTextChangedListener(this.mTextWatcher);
-		this.mPasswordConfirm = (EditText) findViewById(R.id.account_password_confirm);
-		this.mAvatar = (ImageView) findViewById(R.id.avater);
-		this.mAvatar.setOnClickListener(this.mAvatarClickListener);
-		this.mRegisterNew = (CheckBox) findViewById(R.id.account_register_new);
-		this.mStats = (LinearLayout) findViewById(R.id.stats);
-		this.mSessionEst = (TextView) findViewById(R.id.session_est);
-		this.mServerInfoRosterVersion = (TextView) findViewById(R.id.server_info_roster_version);
-		this.mServerInfoCarbons = (TextView) findViewById(R.id.server_info_carbons);
-		this.mServerInfoMam = (TextView) findViewById(R.id.server_info_mam);
-		this.mServerInfoCSI = (TextView) findViewById(R.id.server_info_csi);
-		this.mServerInfoBlocking = (TextView) findViewById(R.id.server_info_blocking);
-		this.mServerInfoSm = (TextView) findViewById(R.id.server_info_sm);
-		this.mServerInfoPep = (TextView) findViewById(R.id.server_info_pep);
-		this.mOtrFingerprint = (TextView) findViewById(R.id.otr_fingerprint);
-		this.mOtrFingerprintBox = (RelativeLayout) findViewById(R.id.otr_fingerprint_box);
-		this.mOtrFingerprintToClipboardButton = (ImageButton) findViewById(R.id.action_copy_to_clipboard);
-		this.mSaveButton = (Button) findViewById(R.id.save_button);
-		this.mCancelButton = (Button) findViewById(R.id.cancel_button);
-		this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
-		this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
-		this.mMoreTable = (TableLayout) findViewById(R.id.server_info_more);
-		final OnCheckedChangeListener OnCheckedShowConfirmPassword = new OnCheckedChangeListener() {
-			@Override
-			public void onCheckedChanged(final CompoundButton buttonView,
-					final boolean isChecked) {
-				if (isChecked) {
-					mPasswordConfirm.setVisibility(View.VISIBLE);
-				} else {
-					mPasswordConfirm.setVisibility(View.GONE);
-				}
-				updateSaveButton();
-			}
-		};
-		this.mRegisterNew.setOnCheckedChangeListener(OnCheckedShowConfirmPassword);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(final Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		getMenuInflater().inflate(R.menu.editaccount, menu);
-		final MenuItem showQrCode = menu.findItem(R.id.action_show_qr_code);
-		final MenuItem showBlocklist = menu.findItem(R.id.action_show_block_list);
-		final MenuItem showMoreInfo = menu.findItem(R.id.action_server_info_show_more);
-		final MenuItem changePassword = menu.findItem(R.id.action_change_password_on_server);
-		if (mAccount != null && mAccount.isOnlineAndConnected()) {
-			if (!mAccount.getXmppConnection().getFeatures().blocking()) {
-				showBlocklist.setVisible(false);
-			}
-			if (!mAccount.getXmppConnection().getFeatures().register()) {
-				changePassword.setVisible(false);
-			}
-		} else {
-			showQrCode.setVisible(false);
-			showBlocklist.setVisible(false);
-			showMoreInfo.setVisible(false);
-			changePassword.setVisible(false);
-		}
-		return true;
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		if (getIntent() != null) {
-			try {
-				this.jidToEdit = Jid.fromString(getIntent().getStringExtra("jid"));
-			} catch (final InvalidJidException | NullPointerException ignored) {
-				this.jidToEdit = null;
-			}
-			if (this.jidToEdit != null) {
-				this.mRegisterNew.setVisibility(View.GONE);
-				if (getActionBar() != null) {
-					getActionBar().setTitle(getString(R.string.account_details));
-				}
-			} else {
-				this.mAvatar.setVisibility(View.GONE);
-				if (getActionBar() != null) {
-					getActionBar().setTitle(R.string.action_add_account);
-				}
-			}
-		}
-	}
-
-	@Override
-	protected void onBackendConnected() {
-		final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
-				android.R.layout.simple_list_item_1,
-				xmppConnectionService.getKnownHosts());
-		if (this.jidToEdit != null) {
-			this.mAccount = xmppConnectionService.findAccountByJid(jidToEdit);
-			updateAccountInformation();
-		} else if (this.xmppConnectionService.getAccounts().size() == 0) {
-			if (getActionBar() != null) {
-				getActionBar().setDisplayHomeAsUpEnabled(false);
-				getActionBar().setDisplayShowHomeEnabled(false);
-				getActionBar().setHomeButtonEnabled(false);
-			}
-			this.mCancelButton.setEnabled(false);
-			this.mCancelButton.setTextColor(getSecondaryTextColor());
-		}
-		this.mAccountJid.setAdapter(mKnownHostsAdapter);
-		updateSaveButton();
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_show_block_list:
-				final Intent showBlocklistIntent = new Intent(this, BlocklistActivity.class);
-				showBlocklistIntent.putExtra("account", mAccount.getJid().toString());
-				startActivity(showBlocklistIntent);
-				break;
-			case R.id.action_server_info_show_more:
-				mMoreTable.setVisibility(item.isChecked() ? View.GONE : View.VISIBLE);
-				item.setChecked(!item.isChecked());
-				break;
-			case R.id.action_change_password_on_server:
-				final Intent changePasswordIntent = new Intent(this, ChangePasswordActivity.class);
-				changePasswordIntent.putExtra("account", mAccount.getJid().toString());
-				startActivity(changePasswordIntent);
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	private void updateAccountInformation() {
-		this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
-		this.mPassword.setText(this.mAccount.getPassword());
-		if (this.jidToEdit != null) {
-			this.mAvatar.setVisibility(View.VISIBLE);
-			this.mAvatar.setImageBitmap(avatarService().get(this.mAccount, getPixel(72)));
-		}
-		if (this.mAccount.isOptionSet(Account.OPTION_REGISTER)) {
-			this.mRegisterNew.setVisibility(View.VISIBLE);
-			this.mRegisterNew.setChecked(true);
-			this.mPasswordConfirm.setText(this.mAccount.getPassword());
-		} else {
-			this.mRegisterNew.setVisibility(View.GONE);
-			this.mRegisterNew.setChecked(false);
-		}
-		if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
-			this.mStats.setVisibility(View.VISIBLE);
-			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(this, this.mAccount.getXmppConnection()
-						.getLastSessionEstablished()));
-			Features features = this.mAccount.getXmppConnection().getFeatures();
-			if (features.rosterVersioning()) {
-				this.mServerInfoRosterVersion.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoRosterVersion.setText(R.string.server_info_unavailable);
-			}
-			if (features.carbons()) {
-				this.mServerInfoCarbons.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoCarbons
-					.setText(R.string.server_info_unavailable);
-			}
-			if (features.mam()) {
-				this.mServerInfoMam.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoMam.setText(R.string.server_info_unavailable);
-			}
-			if (features.csi()) {
-				this.mServerInfoCSI.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoCSI.setText(R.string.server_info_unavailable);
-			}
-			if (features.blocking()) {
-				this.mServerInfoBlocking.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoBlocking.setText(R.string.server_info_unavailable);
-			}
-			if (features.sm()) {
-				this.mServerInfoSm.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoSm.setText(R.string.server_info_unavailable);
-			}
-			if (features.pubsub()) {
-				this.mServerInfoPep.setText(R.string.server_info_available);
-			} else {
-				this.mServerInfoPep.setText(R.string.server_info_unavailable);
-			}
-			final String fingerprint = this.mAccount.getOtrFingerprint();
-			if (fingerprint != null) {
-				this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
-				this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(fingerprint));
-				this.mOtrFingerprintToClipboardButton
-					.setVisibility(View.VISIBLE);
-				this.mOtrFingerprintToClipboardButton
-					.setOnClickListener(new View.OnClickListener() {
-
-						@Override
-						public void onClick(final View v) {
-
-							if (copyTextToClipboard(fingerprint, R.string.otr_fingerprint)) {
-								Toast.makeText(
-										EditAccountActivity.this,
-										R.string.toast_message_otr_fingerprint,
-										Toast.LENGTH_SHORT).show();
-							}
-						}
-					});
-			} else {
-				this.mOtrFingerprintBox.setVisibility(View.GONE);
-			}
-		} else {
-			if (this.mAccount.errorStatus()) {
-				this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
-				this.mAccountJid.requestFocus();
-			} else {
-				this.mAccountJid.setError(null);
-			}
-			this.mStats.setVisibility(View.GONE);
-		}
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
deleted file mode 100644
index a7aa2024..00000000
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.content.Context;
-import android.os.Handler;
-import android.util.AttributeSet;
-import android.view.KeyEvent;
-import android.widget.EditText;
-
-import eu.siacs.conversations.Config;
-import github.ankushsachdeva.emojicon.EmojiconEditText;
-
-public class EditMessage extends EmojiconEditText {
-
-	public EditMessage(Context context, AttributeSet attrs) {
-		super(context, attrs);
-	}
-
-	public EditMessage(Context context) {
-		super(context);
-	}
-
-	protected Handler mTypingHandler = new Handler();
-
-	protected Runnable mTypingTimeout = new Runnable() {
-		@Override
-		public void run() {
-			if (isUserTyping && keyboardListener != null) {
-				keyboardListener.onTypingStopped();
-				isUserTyping = false;
-			}
-		}
-	};
-
-	private boolean isUserTyping = false;
-
-	protected KeyboardListener keyboardListener;
-
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_ENTER) {
-			if (keyboardListener != null && keyboardListener.onEnterPressed()) {
-				return true;
-			}
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-
-	@Override
-	public void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
-		super.onTextChanged(text,start,lengthBefore,lengthAfter);
-		if (this.mTypingHandler != null && this.keyboardListener != null) {
-			this.mTypingHandler.removeCallbacks(mTypingTimeout);
-			this.mTypingHandler.postDelayed(mTypingTimeout, Config.TYPING_TIMEOUT * 1000);
-			final int length = text.length();
-			if (!isUserTyping && length > 0) {
-				this.isUserTyping = true;
-				this.keyboardListener.onTypingStarted();
-			} else if (length == 0) {
-				this.isUserTyping = false;
-				this.keyboardListener.onTextDeleted();
-			}
-		}
-	}
-
-	public void setKeyboardListener(KeyboardListener listener) {
-		this.keyboardListener = listener;
-		if (listener != null) {
-			this.isUserTyping = false;
-		}
-	}
-
-	public interface KeyboardListener {
-		public boolean onEnterPressed();
-		public void onTypingStarted();
-		public void onTypingStopped();
-		public void onTextDeleted();
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
deleted file mode 100644
index b2d5ddfd..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ /dev/null
@@ -1,273 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.services.XmppConnectionService.OnAccountUpdate;
-import eu.siacs.conversations.ui.adapter.AccountAdapter;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-
-public class ManageAccountActivity extends XmppActivity implements OnAccountUpdate {
-
-	protected Account selectedAccount = null;
-
-	protected final List<Account> accountList = new ArrayList<>();
-	protected ListView accountListView;
-	protected AccountAdapter mAccountAdapter;
-
-	@Override
-	public void onAccountUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		synchronized (this.accountList) {
-			accountList.clear();
-			accountList.addAll(xmppConnectionService.getAccounts());
-		}
-		invalidateOptionsMenu();
-		mAccountAdapter.notifyDataSetChanged();
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.manage_accounts);
-
-		accountListView = (ListView) findViewById(R.id.account_list);
-		this.mAccountAdapter = new AccountAdapter(this, accountList);
-		accountListView.setAdapter(this.mAccountAdapter);
-		accountListView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View view,
-					int position, long arg3) {
-				switchToAccount(accountList.get(position));
-			}
-		});
-		registerForContextMenu(accountListView);
-	}
-
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v,
-			ContextMenuInfo menuInfo) {
-		super.onCreateContextMenu(menu, v, menuInfo);
-		ManageAccountActivity.this.getMenuInflater().inflate(
-				R.menu.manageaccounts_context, menu);
-		AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
-		this.selectedAccount = accountList.get(acmi.position);
-		if (this.selectedAccount.isOptionSet(Account.OPTION_DISABLED)) {
-			menu.findItem(R.id.mgmt_account_disable).setVisible(false);
-			menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(false);
-			menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false);
-		} else {
-			menu.findItem(R.id.mgmt_account_enable).setVisible(false);
-		}
-		menu.setHeaderTitle(this.selectedAccount.getJid().toBareJid().toString());
-	}
-
-	@Override
-	void onBackendConnected() {
-		this.accountList.clear();
-		this.accountList.addAll(xmppConnectionService.getAccounts());
-		mAccountAdapter.notifyDataSetChanged();
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.manageaccounts, menu);
-		MenuItem enableAll = menu.findItem(R.id.action_enable_all);
-		if (!accountsLeftToEnable()) {
-			enableAll.setVisible(false);
-		}
-		MenuItem disableAll = menu.findItem(R.id.action_disable_all);
-		if (!accountsLeftToDisable()) {
-			disableAll.setVisible(false);
-		}
-		return true;
-	}
-
-	@Override
-	public boolean onContextItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.mgmt_account_publish_avatar:
-			publishAvatar(selectedAccount);
-			return true;
-		case R.id.mgmt_account_disable:
-			disableAccount(selectedAccount);
-			return true;
-		case R.id.mgmt_account_enable:
-			enableAccount(selectedAccount);
-			return true;
-		case R.id.mgmt_account_delete:
-			deleteAccount(selectedAccount);
-			return true;
-		case R.id.mgmt_account_announce_pgp:
-			publishOpenPGPPublicKey(selectedAccount);
-			return true;
-		default:
-			return super.onContextItemSelected(item);
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_add_account:
-				startActivity(new Intent(getApplicationContext(),
-						EditAccountActivity.class));
-				break;
-			case R.id.action_disable_all:
-				disableAllAccounts();
-				break;
-			case R.id.action_enable_all:
-				enableAllAccounts();
-				break;
-			default:
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public boolean onNavigateUp() {
-		if (xmppConnectionService.getConversations().size() == 0) {
-			Intent contactsIntent = new Intent(this,
-					StartConversationActivity.class);
-			contactsIntent.setFlags(
-			// if activity exists in stack, pop the stack and go back to it
-					Intent.FLAG_ACTIVITY_CLEAR_TOP |
-					// otherwise, make a new task for it
-							Intent.FLAG_ACTIVITY_NEW_TASK |
-							// don't use the new activity animation; finish
-							// animation runs instead
-							Intent.FLAG_ACTIVITY_NO_ANIMATION);
-			startActivity(contactsIntent);
-			finish();
-			return true;
-		} else {
-			return super.onNavigateUp();
-		}
-	}
-
-	private void publishAvatar(Account account) {
-		Intent intent = new Intent(getApplicationContext(),
-				PublishProfilePictureActivity.class);
-		intent.putExtra("account", account.getJid().toString());
-		startActivity(intent);
-	}
-
-	private void disableAllAccounts() {
-		List<Account> list = new ArrayList<>();
-		synchronized (this.accountList) {
-			for (Account account : this.accountList) {
-				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-					list.add(account);
-				}
-			}
-		}
-		for(Account account : list) {
-			disableAccount(account);
-		}
-	}
-
-	private boolean accountsLeftToDisable() {
-		synchronized (this.accountList) {
-			for (Account account : this.accountList) {
-				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private boolean accountsLeftToEnable() {
-		synchronized (this.accountList) {
-			for (Account account : this.accountList) {
-				if (account.isOptionSet(Account.OPTION_DISABLED)) {
-					return true;
-				}
-			}
-			return false;
-		}
-	}
-
-	private void enableAllAccounts() {
-		List<Account> list = new ArrayList<>();
-		synchronized (this.accountList) {
-			for (Account account : this.accountList) {
-				if (account.isOptionSet(Account.OPTION_DISABLED)) {
-					list.add(account);
-				}
-			}
-		}
-		for(Account account : list) {
-			enableAccount(account);
-		}
-	}
-
-	private void disableAccount(Account account) {
-		account.setOption(Account.OPTION_DISABLED, true);
-		xmppConnectionService.updateAccount(account);
-	}
-
-	private void enableAccount(Account account) {
-		account.setOption(Account.OPTION_DISABLED, false);
-		xmppConnectionService.updateAccount(account);
-	}
-
-	private void publishOpenPGPPublicKey(Account account) {
-		if (ManageAccountActivity.this.hasPgp()) {
-			announcePgp(account, null);
-		} else {
-			this.showInstallPgpDialog();
-		}
-	}
-
-	private void deleteAccount(final Account account) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(
-				ManageAccountActivity.this);
-		builder.setTitle(getString(R.string.mgmt_account_are_you_sure));
-		builder.setIconAttribute(android.R.attr.alertDialogIcon);
-		builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text));
-		builder.setPositiveButton(getString(R.string.delete),
-				new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						xmppConnectionService.deleteAccount(account);
-						selectedAccount = null;
-					}
-				});
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.create().show();
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (resultCode == RESULT_OK) {
-			if (requestCode == REQUEST_ANNOUNCE_PGP) {
-				announcePgp(selectedAccount, null);
-			}
-		}
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
deleted file mode 100644
index 3f72b723..00000000
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ /dev/null
@@ -1,253 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.utils.PhoneHelper;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.pep.Avatar;
-
-public class PublishProfilePictureActivity extends XmppActivity {
-
-	private static final int REQUEST_CHOOSE_FILE = 0xac23;
-
-	private ImageView avatar;
-	private TextView accountTextView;
-	private TextView hintOrWarning;
-	private TextView secondaryHint;
-	private Button cancelButton;
-	private Button publishButton;
-
-	private Uri avatarUri;
-	private Uri defaultUri;
-	private OnLongClickListener backToDefaultListener = new OnLongClickListener() {
-
-		@Override
-		public boolean onLongClick(View v) {
-			avatarUri = defaultUri;
-			loadImageIntoPreview(defaultUri);
-			return true;
-		}
-	};
-	private Account account;
-	private boolean support = false;
-	private boolean mInitialAccountSetup;
-	private UiCallback<Avatar> avatarPublication = new UiCallback<Avatar>() {
-
-		@Override
-		public void success(Avatar object) {
-			runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-					if (mInitialAccountSetup) {
-						Intent intent = new Intent(getApplicationContext(),
-								StartConversationActivity.class);
-						intent.putExtra("init",true);
-						startActivity(intent);
-					}
-					Toast.makeText(PublishProfilePictureActivity.this,
-							R.string.avatar_has_been_published,
-							Toast.LENGTH_SHORT).show();
-					finish();
-				}
-			});
-		}
-
-		@Override
-		public void error(final int errorCode, Avatar object) {
-			runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-					hintOrWarning.setText(errorCode);
-					hintOrWarning.setTextColor(getWarningTextColor());
-					publishButton.setText(R.string.publish);
-					enablePublishButton();
-				}
-			});
-
-		}
-
-		@Override
-		public void userInputRequried(PendingIntent pi, Avatar object) {
-		}
-	};
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_publish_profile_picture);
-		this.avatar = (ImageView) findViewById(R.id.account_image);
-		this.cancelButton = (Button) findViewById(R.id.cancel_button);
-		this.publishButton = (Button) findViewById(R.id.publish_button);
-		this.accountTextView = (TextView) findViewById(R.id.account);
-		this.hintOrWarning = (TextView) findViewById(R.id.hint_or_warning);
-		this.secondaryHint = (TextView) findViewById(R.id.secondary_hint);
-		this.publishButton.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				if (avatarUri != null) {
-					publishButton.setText(R.string.publishing);
-					disablePublishButton();
-					xmppConnectionService.publishAvatar(account, avatarUri,
-							avatarPublication);
-				}
-			}
-		});
-		this.cancelButton.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				if (mInitialAccountSetup) {
-					Intent intent = new Intent(getApplicationContext(),
-							StartConversationActivity.class);
-					intent.putExtra("init",true);
-					startActivity(intent);
-				}
-				finish();
-			}
-		});
-		this.avatar.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				Intent attachFileIntent = new Intent();
-				attachFileIntent.setType("image/*");
-				attachFileIntent.setAction(Intent.ACTION_GET_CONTENT);
-				Intent chooser = Intent.createChooser(attachFileIntent,
-						getString(R.string.attach_file));
-				startActivityForResult(chooser, REQUEST_CHOOSE_FILE);
-			}
-		});
-		this.defaultUri = PhoneHelper.getSefliUri(getApplicationContext());
-	}
-
-	@Override
-	protected void onActivityResult(int requestCode, int resultCode,
-			final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (resultCode == RESULT_OK) {
-			if (requestCode == REQUEST_CHOOSE_FILE) {
-				this.avatarUri = data.getData();
-				if (xmppConnectionServiceBound) {
-					loadImageIntoPreview(this.avatarUri);
-				}
-			}
-		}
-	}
-
-	@Override
-	protected void onBackendConnected() {
-		if (getIntent() != null) {
-            Jid jid;
-            try {
-                jid = Jid.fromString(getIntent().getStringExtra("account"));
-            } catch (InvalidJidException e) {
-                jid = null;
-            }
-            if (jid != null) {
-				this.account = xmppConnectionService.findAccountByJid(jid);
-				if (this.account.getXmppConnection() != null) {
-					this.support = this.account.getXmppConnection()
-							.getFeatures().pubsub();
-				}
-				if (this.avatarUri == null) {
-					if (this.account.getAvatar() != null
-							|| this.defaultUri == null) {
-						this.avatar.setImageBitmap(avatarService().get(account,
-								getPixel(194)));
-						if (this.defaultUri != null) {
-							this.avatar
-									.setOnLongClickListener(this.backToDefaultListener);
-						} else {
-							this.secondaryHint.setVisibility(View.INVISIBLE);
-						}
-						if (!support) {
-							this.hintOrWarning
-									.setTextColor(getWarningTextColor());
-							this.hintOrWarning
-									.setText(R.string.error_publish_avatar_no_server_support);
-						}
-					} else {
-						this.avatarUri = this.defaultUri;
-						loadImageIntoPreview(this.defaultUri);
-						this.secondaryHint.setVisibility(View.INVISIBLE);
-					}
-				} else {
-					loadImageIntoPreview(avatarUri);
-				}
-				this.accountTextView.setText(this.account.getJid().toBareJid().toString());
-			}
-		}
-
-	}
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		if (getIntent() != null) {
-			this.mInitialAccountSetup = getIntent().getBooleanExtra("setup",
-					false);
-		}
-		if (this.mInitialAccountSetup) {
-			this.cancelButton.setText(R.string.skip);
-		}
-	}
-
-	protected void loadImageIntoPreview(Uri uri) {
-		Bitmap bm = xmppConnectionService.getFileBackend().cropCenterSquare(
-				uri, 384);
-		if (bm == null) {
-			disablePublishButton();
-			this.hintOrWarning.setTextColor(getWarningTextColor());
-			this.hintOrWarning
-					.setText(R.string.error_publish_avatar_converting);
-			return;
-		}
-		this.avatar.setImageBitmap(bm);
-		if (support) {
-			enablePublishButton();
-			this.publishButton.setText(R.string.publish);
-			this.hintOrWarning.setText(R.string.publish_avatar_explanation);
-			this.hintOrWarning.setTextColor(getPrimaryTextColor());
-		} else {
-			disablePublishButton();
-			this.hintOrWarning.setTextColor(getWarningTextColor());
-			this.hintOrWarning
-					.setText(R.string.error_publish_avatar_no_server_support);
-		}
-		if (this.defaultUri != null && uri.equals(this.defaultUri)) {
-			this.secondaryHint.setVisibility(View.INVISIBLE);
-			this.avatar.setOnLongClickListener(null);
-		} else if (this.defaultUri != null) {
-			this.secondaryHint.setVisibility(View.VISIBLE);
-			this.avatar.setOnLongClickListener(this.backToDefaultListener);
-		}
-	}
-
-	protected void enablePublishButton() {
-		this.publishButton.setEnabled(true);
-		this.publishButton.setTextColor(getPrimaryTextColor());
-	}
-
-	protected void disablePublishButton() {
-		this.publishButton.setEnabled(false);
-		this.publishButton.setTextColor(getSecondaryTextColor());
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
deleted file mode 100644
index 2115b23b..00000000
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Locale;
-
-import de.tzur.conversations.Settings;
-import eu.siacs.conversations.entities.Account;
-
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.PreferenceManager;
-
-public class SettingsActivity extends XmppActivity implements
-		OnSharedPreferenceChangeListener {
-	private SettingsFragment mSettingsFragment;
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		mSettingsFragment = new SettingsFragment();
-		getFragmentManager().beginTransaction()
-				.replace(android.R.id.content, mSettingsFragment).commit();
-	}
-
-	@Override
-	void onBackendConnected() {
-
-	}
-
-	@Override
-	public void onStart() {
-		super.onStart();
-		PreferenceManager.getDefaultSharedPreferences(this)
-				.registerOnSharedPreferenceChangeListener(this);
-		ListPreference resources = (ListPreference) mSettingsFragment
-				.findPreference("resource");
-		if (resources != null) {
-			ArrayList<CharSequence> entries = new ArrayList<CharSequence>(
-					Arrays.asList(resources.getEntries()));
-			entries.add(0, Build.MODEL);
-			resources.setEntries(entries.toArray(new CharSequence[entries
-					.size()]));
-			resources.setEntryValues(entries.toArray(new CharSequence[entries
-					.size()]));
-		}
-	}
-
-	@Override
-	public void onStop() {
-		super.onStop();
-		PreferenceManager.getDefaultSharedPreferences(this)
-				.unregisterOnSharedPreferenceChangeListener(this);
-	}
-
-	@Override
-	public void onSharedPreferenceChanged(SharedPreferences preferences,
-			String name) {
-        // need to synchronize the settings class first
-        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
-        switch (name) {
-            case "resource":
-                String resource = preferences.getString("resource", "mobile")
-                        .toLowerCase(Locale.US);
-                if (xmppConnectionServiceBound) {
-                    for (Account account : xmppConnectionService.getAccounts()) {
-                        account.setResource(resource);
-                        if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-                            xmppConnectionService.reconnectAccountInBackground(account);
-                        }
-                    }
-                }
-                break;
-            case "keep_foreground_service":
-                xmppConnectionService.toggleForegroundService();
-                break;
-			case "confirm_messages_list":
-				if (xmppConnectionServiceBound) {
-					for (Account account : xmppConnectionService.getAccounts()) {
-						if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-							xmppConnectionService.sendPresence(account);
-						}
-					}
-				}
-				break;
-        }
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
deleted file mode 100644
index e4185abc..00000000
--- a/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.Dialog;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceScreen;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewParent;
-import android.widget.FrameLayout;
-import android.widget.LinearLayout;
-
-import eu.siacs.conversations.R;
-
-public class SettingsFragment extends PreferenceFragment {
-
-	//http://stackoverflow.com/questions/16374820/action-bar-home-button-not-functional-with-nested-preferencescreen/16800527#16800527
-	private void initializeActionBar(PreferenceScreen preferenceScreen) {
-		final Dialog dialog = preferenceScreen.getDialog();
-
-		if (dialog != null) {
-			View homeBtn = dialog.findViewById(android.R.id.home);
-
-			if (homeBtn != null) {
-				View.OnClickListener dismissDialogClickListener = new View.OnClickListener() {
-					@Override
-					public void onClick(View v) {
-						dialog.dismiss();
-					}
-				};
-
-				ViewParent homeBtnContainer = homeBtn.getParent();
-
-				if (homeBtnContainer instanceof FrameLayout) {
-					ViewGroup containerParent = (ViewGroup) homeBtnContainer.getParent();
-					if (containerParent instanceof LinearLayout) {
-						((LinearLayout) containerParent).setOnClickListener(dismissDialogClickListener);
-					} else {
-						((FrameLayout) homeBtnContainer).setOnClickListener(dismissDialogClickListener);
-					}
-				} else {
-					homeBtn.setOnClickListener(dismissDialogClickListener);
-				}
-			}
-		}
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		// Load the preferences from an XML resource
-		addPreferencesFromResource(R.xml.preferences);
-	}
-
-	@Override
-	public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
-		super.onPreferenceTreeClick(preferenceScreen, preference);
-		if (preference instanceof PreferenceScreen) {
-			initializeActionBar((PreferenceScreen) preference);
-		}
-		return false;
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
deleted file mode 100644
index 6be238dc..00000000
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ /dev/null
@@ -1,222 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.PendingIntent;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Toast;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLConnection;
-import java.net.URLDecoder;
-import java.nio.charset.UnsupportedCharsetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.ui.adapter.ConversationAdapter;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class ShareWithActivity extends XmppActivity {
-
-	private class Share {
-		public Uri uri;
-		public boolean image;
-		public String account;
-		public String contact;
-		public String text;
-	}
-
-	private Share share;
-
-	private static final int REQUEST_START_NEW_CONVERSATION = 0x0501;
-	private ListView mListView;
-	private List<Conversation> mConversations = new ArrayList<>();
-
-	private UiCallback<Message> attachFileCallback = new UiCallback<Message>() {
-
-		@Override
-		public void userInputRequried(PendingIntent pi, Message object) {
-			// TODO Auto-generated method stub
-
-		}
-
-		@Override
-		public void success(Message message) {
-			xmppConnectionService.sendMessage(message);
-		}
-
-		@Override
-		public void error(int errorCode, Message object) {
-			// TODO Auto-generated method stub
-
-		}
-	};
-
-	protected void onActivityResult(int requestCode, int resultCode,
-			final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == REQUEST_START_NEW_CONVERSATION
-				&& resultCode == RESULT_OK) {
-			share.contact = data.getStringExtra("contact");
-			share.account = data.getStringExtra("account");
-			Log.d(Config.LOGTAG, "contact: " + share.contact + " account:"
-					+ share.account);
-		}
-		if (xmppConnectionServiceBound && share != null
-				&& share.contact != null && share.account != null) {
-			share();
-		}
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		if (getActionBar() != null) {
-			getActionBar().setDisplayHomeAsUpEnabled(false);
-			getActionBar().setHomeButtonEnabled(false);
-		}
-
-		setContentView(R.layout.share_with);
-		setTitle(getString(R.string.title_activity_sharewith));
-
-		mListView = (ListView) findViewById(R.id.choose_conversation_list);
-		ConversationAdapter mAdapter = new ConversationAdapter(this,
-				this.mConversations);
-		mListView.setAdapter(mAdapter);
-		mListView.setOnItemClickListener(new OnItemClickListener() {
-
-			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1,
-					int position, long arg3) {
-				Conversation conversation = mConversations.get(position);
-				if (conversation.getMode() == Conversation.MODE_SINGLE
-						|| share.uri == null) {
-					share(mConversations.get(position));
-				}
-			}
-		});
-
-		this.share = new Share();
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.share_with, menu);
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.action_add:
-			final Intent intent = new Intent(getApplicationContext(),
-					ChooseContactActivity.class);
-			startActivityForResult(intent, REQUEST_START_NEW_CONVERSATION);
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public void onStart() {
-		final String type = getIntent().getType();
-		final Uri uri = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
-		if (type != null && uri != null && !type.equalsIgnoreCase("text/plain")) {
-			this.share.uri = uri;
-			this.share.image = type.startsWith("image/") || isImage(uri);
-		} else {
-			this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
-		}
-		if (xmppConnectionServiceBound) {
-			xmppConnectionService.populateWithOrderedConversations(mConversations, this.share.uri == null);
-		}
-		super.onStart();
-	}
-
-	protected boolean isImage(Uri uri) {
-		try {
-			String guess = URLConnection.guessContentTypeFromName(uri.toString());
-			return (guess != null && guess.startsWith("image/"));
-		} catch (final StringIndexOutOfBoundsException ignored) {
-			return false;
-		}
-	}
-
-	@Override
-	void onBackendConnected() {
-		if (xmppConnectionServiceBound && share != null
-				&& share.contact != null && share.account != null) {
-			share();
-			return;
-		}
-		xmppConnectionService.populateWithOrderedConversations(mConversations,
-				this.share != null && this.share.uri == null);
-	}
-
-	private void share() {
-        Account account;
-        try {
-            account = xmppConnectionService.findAccountByJid(Jid.fromString(share.account));
-        } catch (final InvalidJidException e) {
-            account = null;
-        }
-        if (account == null) {
-			return;
-		}
-        final Conversation conversation;
-        try {
-            conversation = xmppConnectionService
-                    .findOrCreateConversation(account, Jid.fromString(share.contact), false);
-        } catch (final InvalidJidException e) {
-            return;
-        }
-        share(conversation);
-	}
-
-	private void share(final Conversation conversation) {
-		if (share.uri != null) {
-			selectPresence(conversation, new OnPresenceSelected() {
-				@Override
-				public void onPresenceSelected() {
-					if (share.image) {
-						Toast.makeText(getApplicationContext(),
-								getText(R.string.preparing_image),
-								Toast.LENGTH_LONG).show();
-						ShareWithActivity.this.xmppConnectionService
-							.attachImageToConversation(conversation, share.uri,
-									attachFileCallback);
-					} else {
-						Toast.makeText(getApplicationContext(),
-								getText(R.string.preparing_file),
-								Toast.LENGTH_LONG).show();
-						ShareWithActivity.this.xmppConnectionService
-							.attachFileToConversation(conversation, share.uri,
-									attachFileCallback);
-					}
-					switchToConversation(conversation, null, true);
-					finish();
-				}
-			});
-
-		} else {
-			switchToConversation(conversation, this.share.text, true);
-			finish();
-		}
-
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
deleted file mode 100644
index a556b8b7..00000000
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ /dev/null
@@ -1,819 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.ActionBar.Tab;
-import android.app.ActionBar.TabListener;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.app.FragmentTransaction;
-import android.app.ListFragment;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Parcelable;
-import android.support.v13.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.util.Log;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.AdapterView;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.CheckBox;
-import android.widget.Checkable;
-import android.widget.EditText;
-import android.widget.ListView;
-import android.widget.Spinner;
-
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Blockable;
-import eu.siacs.conversations.entities.Bookmark;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.entities.Presences;
-import eu.siacs.conversations.services.XmppConnectionService.OnRosterUpdate;
-import eu.siacs.conversations.ui.adapter.KnownHostsAdapter;
-import eu.siacs.conversations.ui.adapter.ListItemAdapter;
-import eu.siacs.conversations.utils.XmppUri;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist {
-
-	public int conference_context_id;
-	public int contact_context_id;
-	private Tab mContactsTab;
-	private Tab mConferencesTab;
-	private ViewPager mViewPager;
-	private MyListFragment mContactsListFragment = new MyListFragment();
-	private List<ListItem> contacts = new ArrayList<>();
-	private ArrayAdapter<ListItem> mContactsAdapter;
-	private MyListFragment mConferenceListFragment = new MyListFragment();
-	private List<ListItem> conferences = new ArrayList<ListItem>();
-	private ArrayAdapter<ListItem> mConferenceAdapter;
-	private List<String> mActivatedAccounts = new ArrayList<String>();
-	private List<String> mKnownHosts;
-	private List<String> mKnownConferenceHosts;
-	private Invite mPendingInvite = null;
-	private Menu mOptionsMenu;
-	private EditText mSearchEditText;
-	private MenuItem.OnActionExpandListener mOnActionExpandListener = new MenuItem.OnActionExpandListener() {
-
-		@Override
-		public boolean onMenuItemActionExpand(MenuItem item) {
-			mSearchEditText.post(new Runnable() {
-
-				@Override
-				public void run() {
-					mSearchEditText.requestFocus();
-					InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-					imm.showSoftInput(mSearchEditText,
-							InputMethodManager.SHOW_IMPLICIT);
-				}
-			});
-
-			return true;
-		}
-
-		@Override
-		public boolean onMenuItemActionCollapse(MenuItem item) {
-			InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-			imm.hideSoftInputFromWindow(mSearchEditText.getWindowToken(),
-					InputMethodManager.HIDE_IMPLICIT_ONLY);
-			mSearchEditText.setText("");
-			filter(null);
-			return true;
-		}
-	};
-	private boolean mHideOfflineContacts = false;
-	private TabListener mTabListener = new TabListener() {
-
-		@Override
-		public void onTabUnselected(Tab tab, FragmentTransaction ft) {
-			return;
-		}
-
-		@Override
-		public void onTabSelected(Tab tab, FragmentTransaction ft) {
-			mViewPager.setCurrentItem(tab.getPosition());
-			onTabChanged();
-		}
-
-		@Override
-		public void onTabReselected(Tab tab, FragmentTransaction ft) {
-			return;
-		}
-	};
-	private ViewPager.SimpleOnPageChangeListener mOnPageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
-		@Override
-		public void onPageSelected(int position) {
-			if (getActionBar() != null) {
-				getActionBar().setSelectedNavigationItem(position);
-			}
-			onTabChanged();
-		}
-	};
-	private TextWatcher mSearchTextWatcher = new TextWatcher() {
-
-		@Override
-		public void afterTextChanged(Editable editable) {
-			filter(editable.toString());
-		}
-
-		@Override
-		public void beforeTextChanged(CharSequence s, int start, int count,
-				int after) {
-		}
-
-		@Override
-		public void onTextChanged(CharSequence s, int start, int before,
-				int count) {
-		}
-	};
-	private MenuItem mMenuSearchView;
-	private ListItemAdapter.OnTagClickedListener mOnTagClickedListener = new ListItemAdapter.OnTagClickedListener() {
-		@Override
-		public void onTagClicked(String tag) {
-			if (mMenuSearchView != null) {
-				mMenuSearchView.expandActionView();
-				mSearchEditText.setText("");
-				mSearchEditText.append(tag);
-				filter(tag);
-			}
-		}
-	};
-	private String mInitialJid;
-
-	@Override
-	public void onRosterUpdate() {
-		this.refreshUi();
-	}
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_start_conversation);
-		mViewPager = (ViewPager) findViewById(R.id.start_conversation_view_pager);
-		ActionBar actionBar = getActionBar();
-		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
-
-		mContactsTab = actionBar.newTab().setText(R.string.contacts)
-			.setTabListener(mTabListener);
-		mConferencesTab = actionBar.newTab().setText(R.string.conferences)
-			.setTabListener(mTabListener);
-		actionBar.addTab(mContactsTab);
-		actionBar.addTab(mConferencesTab);
-
-		mViewPager.setOnPageChangeListener(mOnPageChangeListener);
-		mViewPager.setAdapter(new FragmentPagerAdapter(getFragmentManager()) {
-
-			@Override
-			public int getCount() {
-				return 2;
-			}
-
-			@Override
-			public Fragment getItem(int position) {
-				if (position == 0) {
-					return mContactsListFragment;
-				} else {
-					return mConferenceListFragment;
-				}
-			}
-		});
-
-		mConferenceAdapter = new ListItemAdapter(this, conferences);
-		mConferenceListFragment.setListAdapter(mConferenceAdapter);
-		mConferenceListFragment.setContextMenu(R.menu.conference_context);
-		mConferenceListFragment
-			.setOnListItemClickListener(new OnItemClickListener() {
-
-				@Override
-				public void onItemClick(AdapterView<?> arg0, View arg1,
-						int position, long arg3) {
-					openConversationForBookmark(position);
-				}
-			});
-
-		mContactsAdapter = new ListItemAdapter(this, contacts);
-		((ListItemAdapter) mContactsAdapter).setOnTagClickedListener(this.mOnTagClickedListener);
-		mContactsListFragment.setListAdapter(mContactsAdapter);
-		mContactsListFragment.setContextMenu(R.menu.contact_context);
-		mContactsListFragment
-			.setOnListItemClickListener(new OnItemClickListener() {
-
-				@Override
-				public void onItemClick(AdapterView<?> arg0, View arg1,
-						int position, long arg3) {
-					openConversationForContact(position);
-				}
-			});
-
-		this.mHideOfflineContacts = getPreferences().getBoolean("hide_offline", false);
-
-	}
-
-	protected void openConversationForContact(int position) {
-		Contact contact = (Contact) contacts.get(position);
-		Conversation conversation = xmppConnectionService
-			.findOrCreateConversation(contact.getAccount(),
-					contact.getJid(), false);
-		switchToConversation(conversation);
-	}
-
-	protected void openConversationForContact() {
-		int position = contact_context_id;
-		openConversationForContact(position);
-	}
-
-	protected void openConversationForBookmark() {
-		openConversationForBookmark(conference_context_id);
-	}
-
-	protected void openConversationForBookmark(int position) {
-		Bookmark bookmark = (Bookmark) conferences.get(position);
-		Conversation conversation = xmppConnectionService
-			.findOrCreateConversation(bookmark.getAccount(),
-					bookmark.getJid(), true);
-		conversation.setBookmark(bookmark);
-		if (!conversation.getMucOptions().online()) {
-			xmppConnectionService.joinMuc(conversation);
-		}
-		if (!bookmark.autojoin()) {
-			bookmark.setAutojoin(true);
-			xmppConnectionService.pushBookmarks(bookmark.getAccount());
-		}
-		switchToConversation(conversation);
-	}
-
-	protected void openDetailsForContact() {
-		int position = contact_context_id;
-		Contact contact = (Contact) contacts.get(position);
-		switchToContactDetails(contact);
-	}
-
-	protected void toggleContactBlock() {
-		final int position = contact_context_id;
-		BlockContactDialog.show(this, xmppConnectionService, (Contact)contacts.get(position));
-	}
-
-	protected void deleteContact() {
-		final int position = contact_context_id;
-		final Contact contact = (Contact) contacts.get(position);
-		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setTitle(R.string.action_delete_contact);
-		builder.setMessage(getString(R.string.remove_contact_text,
-					contact.getJid()));
-		builder.setPositiveButton(R.string.delete, new OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				xmppConnectionService.deleteContactOnServer(contact);
-				filter(mSearchEditText.getText().toString());
-			}
-		});
-		builder.create().show();
-	}
-
-	protected void deleteConference() {
-		int position = conference_context_id;
-		final Bookmark bookmark = (Bookmark) conferences.get(position);
-
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setTitle(R.string.delete_bookmark);
-		builder.setMessage(getString(R.string.remove_bookmark_text,
-					bookmark.getJid()));
-		builder.setPositiveButton(R.string.delete, new OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				bookmark.unregisterConversation();
-				Account account = bookmark.getAccount();
-				account.getBookmarks().remove(bookmark);
-				xmppConnectionService.pushBookmarks(account);
-				filter(mSearchEditText.getText().toString());
-			}
-		});
-		builder.create().show();
-
-	}
-
-	@SuppressLint("InflateParams")
-	protected void showCreateContactDialog(final String prefilledJid, final String fingerprint) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.create_contact);
-		View dialogView = getLayoutInflater().inflate(R.layout.create_contact_dialog, null);
-		final Spinner spinner = (Spinner) dialogView.findViewById(R.id.account);
-		final AutoCompleteTextView jid = (AutoCompleteTextView) dialogView.findViewById(R.id.jid);
-		jid.setAdapter(new KnownHostsAdapter(this,android.R.layout.simple_list_item_1, mKnownHosts));
-		if (prefilledJid != null) {
-			jid.append(prefilledJid);
-			if (fingerprint!=null) {
-				jid.setFocusable(false);
-				jid.setFocusableInTouchMode(false);
-				jid.setClickable(false);
-				jid.setCursorVisible(false);
-			}
-		}
-		populateAccountSpinner(spinner);
-		builder.setView(dialogView);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.create, null);
-		final AlertDialog dialog = builder.create();
-		dialog.show();
-		dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(
-				new View.OnClickListener() {
-
-					@Override
-					public void onClick(final View v) {
-						if (!xmppConnectionServiceBound) {
-							return;
-						}
-						final Jid accountJid;
-						try {
-							accountJid = Jid.fromString((String) spinner.getSelectedItem());
-						} catch (final InvalidJidException e) {
-							return;
-						}
-						final Jid contactJid;
-						try {
-							contactJid = Jid.fromString(jid.getText().toString());
-						} catch (final InvalidJidException e) {
-							jid.setError(getString(R.string.invalid_jid));
-							return;
-						}
-						final Account account = xmppConnectionService
-							.findAccountByJid(accountJid);
-						if (account == null) {
-							dialog.dismiss();
-							return;
-						}
-						final Contact contact = account.getRoster().getContact(contactJid);
-						if (contact.showInRoster()) {
-							jid.setError(getString(R.string.contact_already_exists));
-						} else {
-							contact.addOtrFingerprint(fingerprint);
-							xmppConnectionService.createContact(contact);
-							dialog.dismiss();
-							switchToConversation(contact);
-						}
-					}
-				});
-
-	}
-
-	@SuppressLint("InflateParams")
-	protected void showJoinConferenceDialog(final String prefilledJid) {
-		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.join_conference);
-		final View dialogView = getLayoutInflater().inflate(R.layout.join_conference_dialog, null);
-		final Spinner spinner = (Spinner) dialogView.findViewById(R.id.account);
-		final AutoCompleteTextView jid = (AutoCompleteTextView) dialogView.findViewById(R.id.jid);
-		jid.setAdapter(new KnownHostsAdapter(this,android.R.layout.simple_list_item_1, mKnownConferenceHosts));
-		if (prefilledJid != null) {
-			jid.append(prefilledJid);
-		}
-		populateAccountSpinner(spinner);
-		final Checkable bookmarkCheckBox = (CheckBox) dialogView
-			.findViewById(R.id.bookmark);
-		builder.setView(dialogView);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.join, null);
-		final AlertDialog dialog = builder.create();
-		dialog.show();
-		dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(
-				new View.OnClickListener() {
-
-					@Override
-					public void onClick(final View v) {
-						if (!xmppConnectionServiceBound) {
-							return;
-						}
-						final Jid accountJid;
-						try {
-							accountJid = Jid.fromString((String) spinner.getSelectedItem());
-						} catch (final InvalidJidException e) {
-							return;
-						}
-						final Jid conferenceJid;
-						try {
-							conferenceJid = Jid.fromString(jid.getText().toString());
-						} catch (final InvalidJidException e) {
-							jid.setError(getString(R.string.invalid_jid));
-							return;
-						}
-						final Account account = xmppConnectionService
-							.findAccountByJid(accountJid);
-						if (account == null) {
-							dialog.dismiss();
-							return;
-						}
-						if (bookmarkCheckBox.isChecked()) {
-							if (account.hasBookmarkFor(conferenceJid)) {
-								jid.setError(getString(R.string.bookmark_already_exists));
-							} else {
-								final Bookmark bookmark = new Bookmark(account,conferenceJid.toBareJid());
-								bookmark.setAutojoin(true);
-								account.getBookmarks().add(bookmark);
-								xmppConnectionService
-									.pushBookmarks(account);
-								final Conversation conversation = xmppConnectionService
-									.findOrCreateConversation(account,
-											conferenceJid, true);
-								conversation.setBookmark(bookmark);
-								if (!conversation.getMucOptions().online()) {
-									xmppConnectionService
-										.joinMuc(conversation);
-								}
-								dialog.dismiss();
-								switchToConversation(conversation);
-							}
-						} else {
-							final Conversation conversation = xmppConnectionService
-								.findOrCreateConversation(account,
-										conferenceJid, true);
-							if (!conversation.getMucOptions().online()) {
-								xmppConnectionService.joinMuc(conversation);
-							}
-							dialog.dismiss();
-							switchToConversation(conversation);
-						}
-					}
-				});
-	}
-
-	protected void switchToConversation(Contact contact) {
-		Conversation conversation = xmppConnectionService
-			.findOrCreateConversation(contact.getAccount(),
-					contact.getJid(), false);
-		switchToConversation(conversation);
-	}
-
-	private void populateAccountSpinner(Spinner spinner) {
-		ArrayAdapter<String> adapter = new ArrayAdapter<>(this,
-				android.R.layout.simple_spinner_item, mActivatedAccounts);
-		adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-		spinner.setAdapter(adapter);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		this.mOptionsMenu = menu;
-		getMenuInflater().inflate(R.menu.start_conversation, menu);
-		MenuItem menuCreateContact = menu.findItem(R.id.action_create_contact);
-		MenuItem menuCreateConference = menu.findItem(R.id.action_join_conference);
-		MenuItem menuHideOffline = menu.findItem(R.id.action_hide_offline);
-		menuHideOffline.setChecked(this.mHideOfflineContacts);
-		mMenuSearchView = menu.findItem(R.id.action_search);
-		mMenuSearchView.setOnActionExpandListener(mOnActionExpandListener);
-		View mSearchView = mMenuSearchView.getActionView();
-		mSearchEditText = (EditText) mSearchView
-			.findViewById(R.id.search_field);
-		mSearchEditText.addTextChangedListener(mSearchTextWatcher);
-		if (getActionBar().getSelectedNavigationIndex() == 0) {
-			menuCreateConference.setVisible(false);
-		} else {
-			menuCreateContact.setVisible(false);
-		}
-		if (mInitialJid != null) {
-			mMenuSearchView.expandActionView();
-			mSearchEditText.append(mInitialJid);
-			filter(mInitialJid);
-		}
-		return true;
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_create_contact:
-				showCreateContactDialog(null,null);
-				return true;
-			case R.id.action_join_conference:
-				showJoinConferenceDialog(null);
-				return true;
-			case R.id.action_scan_qr_code:
-				new IntentIntegrator(this).initiateScan();
-				return true;
-			case R.id.action_hide_offline:
-				mHideOfflineContacts = !item.isChecked();
-				getPreferences().edit().putBoolean("hide_offline", mHideOfflineContacts).commit();
-				if (mSearchEditText != null) {
-					filter(mSearchEditText.getText().toString());
-				}
-				invalidateOptionsMenu();
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		if (keyCode == KeyEvent.KEYCODE_SEARCH && !event.isLongPress()) {
-			mOptionsMenu.findItem(R.id.action_search).expandActionView();
-			return true;
-		}
-		return super.onKeyUp(keyCode, event);
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-		if ((requestCode & 0xFFFF) == IntentIntegrator.REQUEST_CODE) {
-			IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-			if (scanResult != null && scanResult.getFormatName() != null) {
-				String data = scanResult.getContents();
-				Invite invite = new Invite(data);
-				if (xmppConnectionServiceBound) {
-					invite.invite();
-				} else if (invite.getJid() != null) {
-					this.mPendingInvite = invite;
-				} else {
-					this.mPendingInvite = null;
-				}
-			}
-		}
-		super.onActivityResult(requestCode, requestCode, intent);
-	}
-
-	@Override
-	protected void onBackendConnected() {
-		this.mActivatedAccounts.clear();
-		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.State.DISABLED) {
-				this.mActivatedAccounts.add(account.getJid().toBareJid().toString());
-			}
-		}
-		final Intent intent = getIntent();
-		final ActionBar ab = getActionBar();
-		if (intent != null && intent.getBooleanExtra("init",false) && ab != null) {
-			ab.setDisplayShowHomeEnabled(false);
-			ab.setDisplayHomeAsUpEnabled(false);
-			ab.setHomeButtonEnabled(false);
-		}
-		this.mKnownHosts = xmppConnectionService.getKnownHosts();
-		this.mKnownConferenceHosts = xmppConnectionService.getKnownConferenceHosts();
-		if (this.mPendingInvite != null) {
-			mPendingInvite.invite();
-			this.mPendingInvite = null;
-		} else if (!handleIntent(getIntent())) {
-			if (mSearchEditText != null) {
-				filter(mSearchEditText.getText().toString());
-			} else {
-				filter(null);
-			}
-		}
-		setIntent(null);
-	}
-
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
-	Invite getInviteJellyBean(NdefRecord record) {
-		return new Invite(record.toUri());
-	}
-
-	protected boolean handleIntent(Intent intent) {
-		if (intent == null || intent.getAction() == null) {
-			return false;
-		}
-		switch (intent.getAction()) {
-			case Intent.ACTION_SENDTO:
-			case Intent.ACTION_VIEW:
-				Log.d(Config.LOGTAG, "received uri=" + intent.getData());
-				return new Invite(intent.getData()).invite();
-			case NfcAdapter.ACTION_NDEF_DISCOVERED:
-				for (Parcelable message : getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES)) {
-					if (message instanceof NdefMessage) {
-						Log.d(Config.LOGTAG, "received message=" + message);
-						for (NdefRecord record : ((NdefMessage) message).getRecords()) {
-							switch (record.getTnf()) {
-								case NdefRecord.TNF_WELL_KNOWN:
-									if (Arrays.equals(record.getType(), NdefRecord.RTD_URI)) {
-										if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-											return getInviteJellyBean(record).invite();
-										} else {
-											byte[] payload = record.getPayload();
-											if (payload[0] == 0) {
-												return new Invite(Uri.parse(new String(Arrays.copyOfRange(
-																	payload, 1, payload.length)))).invite();
-											}
-										}
-									}
-							}
-						}
-					}
-				}
-		}
-		return false;
-	}
-
-	private boolean handleJid(Invite invite) {
-		List<Contact> contacts = xmppConnectionService.findContacts(invite.getJid());
-		if (contacts.size() == 0) {
-			showCreateContactDialog(invite.getJid().toString(),invite.getFingerprint());
-			return false;
-		} else if (contacts.size() == 1) {
-			Contact contact = contacts.get(0);
-			if (invite.getFingerprint() != null) {
-				if (contact.addOtrFingerprint(invite.getFingerprint())) {
-					Log.d(Config.LOGTAG,"added new fingerprint");
-					xmppConnectionService.syncRosterToDisk(contact.getAccount());
-				}
-			}
-			switchToConversation(contact);
-			return true;
-		} else {
-			if (mMenuSearchView != null) {
-				mMenuSearchView.expandActionView();
-				mSearchEditText.setText("");
-				mSearchEditText.append(invite.getJid().toString());
-				filter(invite.getJid().toString());
-			} else {
-				mInitialJid = invite.getJid().toString();
-			}
-			return true;
-		}
-	}
-
-	protected void filter(String needle) {
-		if (xmppConnectionServiceBound) {
-			this.filterContacts(needle);
-			this.filterConferences(needle);
-		}
-	}
-
-	protected void filterContacts(String needle) {
-		this.contacts.clear();
-		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.State.DISABLED) {
-				for (Contact contact : account.getRoster().getContacts()) {
-					if (contact.showInRoster() && contact.match(needle)
-							&& (!this.mHideOfflineContacts
-							|| contact.getPresences().getMostAvailableStatus() < Presences.OFFLINE)) {
-						this.contacts.add(contact);
-					}
-				}
-			}
-		}
-		Collections.sort(this.contacts);
-		mContactsAdapter.notifyDataSetChanged();
-	}
-
-	protected void filterConferences(String needle) {
-		this.conferences.clear();
-		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.State.DISABLED) {
-				for (Bookmark bookmark : account.getBookmarks()) {
-					if (bookmark.match(needle)) {
-						this.conferences.add(bookmark);
-					}
-				}
-			}
-		}
-		Collections.sort(this.conferences);
-		mConferenceAdapter.notifyDataSetChanged();
-	}
-
-	private void onTabChanged() {
-		invalidateOptionsMenu();
-	}
-
-	@Override
-	public void OnUpdateBlocklist(final Status status) {
-		refreshUi();
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		if (mSearchEditText != null) {
-			filter(mSearchEditText.getText().toString());
-		}
-	}
-
-	public static class MyListFragment extends ListFragment {
-		private AdapterView.OnItemClickListener mOnItemClickListener;
-		private int mResContextMenu;
-
-		public void setContextMenu(final int res) {
-			this.mResContextMenu = res;
-		}
-
-		@Override
-		public void onListItemClick(final ListView l, final View v, final int position, final long id) {
-			if (mOnItemClickListener != null) {
-				mOnItemClickListener.onItemClick(l, v, position, id);
-			}
-		}
-
-		public void setOnListItemClickListener(AdapterView.OnItemClickListener l) {
-			this.mOnItemClickListener = l;
-		}
-
-		@Override
-		public void onViewCreated(final View view, final Bundle savedInstanceState) {
-			super.onViewCreated(view, savedInstanceState);
-			registerForContextMenu(getListView());
-			getListView().setFastScrollEnabled(true);
-		}
-
-		@Override
-		public void onCreateContextMenu(final ContextMenu menu, final View v,
-				final ContextMenuInfo menuInfo) {
-			super.onCreateContextMenu(menu, v, menuInfo);
-			final StartConversationActivity activity = (StartConversationActivity) getActivity();
-			activity.getMenuInflater().inflate(mResContextMenu, menu);
-			final AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
-			if (mResContextMenu == R.menu.conference_context) {
-				activity.conference_context_id = acmi.position;
-			} else {
-				activity.contact_context_id = acmi.position;
-				final Blockable contact = (Contact) activity.contacts.get(acmi.position);
-
-				final MenuItem blockUnblockItem = menu.findItem(R.id.context_contact_block_unblock);
-				if (blockUnblockItem != null) {
-					if (contact.isBlocked()) {
-						blockUnblockItem.setTitle(R.string.unblock_contact);
-					} else {
-						blockUnblockItem.setTitle(R.string.block_contact);
-					}
-				}
-			}
-		}
-
-		@Override
-		public boolean onContextItemSelected(final MenuItem item) {
-			StartConversationActivity activity = (StartConversationActivity) getActivity();
-			switch (item.getItemId()) {
-				case R.id.context_start_conversation:
-					activity.openConversationForContact();
-					break;
-				case R.id.context_contact_details:
-					activity.openDetailsForContact();
-					break;
-				case R.id.context_contact_block_unblock:
-					activity.toggleContactBlock();
-					break;
-				case R.id.context_delete_contact:
-					activity.deleteContact();
-					break;
-				case R.id.context_join_conference:
-					activity.openConversationForBookmark();
-					break;
-				case R.id.context_delete_conference:
-					activity.deleteConference();
-			}
-			return true;
-		}
-	}
-
-	private class Invite extends XmppUri {
-
-		public Invite(final Uri uri) {
-			super(uri);
-		}
-
-		public Invite(final String uri) {
-			super(uri);
-		}
-
-		boolean invite() {
-			if (jid != null) {
-				if (muc) {
-					showJoinConferenceDialog(jid);
-				} else {
-					return handleJid(this);
-				}
-			}
-			return false;
-		}
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/TimePreference.java b/src/main/java/eu/siacs/conversations/ui/TimePreference.java
deleted file mode 100644
index e32b068c..00000000
--- a/src/main/java/eu/siacs/conversations/ui/TimePreference.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.preference.DialogPreference;
-import android.preference.Preference;
-import android.util.AttributeSet;
-import android.view.View;
-import android.widget.TimePicker;
-
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Date;
-
-public class TimePreference extends DialogPreference implements Preference.OnPreferenceChangeListener {
-	private TimePicker picker = null;
-	public final static long DEFAULT_VALUE = 0;
-
-	public TimePreference(final Context context, final AttributeSet attrs) {
-		super(context, attrs, 0);
-		this.setOnPreferenceChangeListener(this);
-	}
-
-	protected void setTime(final long time) {
-		persistLong(time);
-		notifyDependencyChange(shouldDisableDependents());
-		notifyChanged();
-	}
-
-	protected void updateSummary(final long time) {
-		final DateFormat dateFormat = android.text.format.DateFormat.getTimeFormat(getContext());
-		final Date date = new Date(time);
-		setSummary(dateFormat.format(date.getTime()));
-	}
-
-	@Override
-	protected View onCreateDialogView() {
-		picker = new TimePicker(getContext());
-		picker.setIs24HourView(android.text.format.DateFormat.is24HourFormat(getContext()));
-		return picker;
-	}
-
-	protected Calendar getPersistedTime() {
-		final Calendar c = Calendar.getInstance();
-		c.setTimeInMillis(getPersistedLong(DEFAULT_VALUE));
-
-		return c;
-	}
-
-	@SuppressWarnings("NullableProblems")
-	@Override
-	protected void onBindDialogView(final View v) {
-		super.onBindDialogView(v);
-		final Calendar c = getPersistedTime();
-
-		picker.setCurrentHour(c.get(Calendar.HOUR_OF_DAY));
-		picker.setCurrentMinute(c.get(Calendar.MINUTE));
-	}
-
-	@Override
-	protected void onDialogClosed(final boolean positiveResult) {
-		super.onDialogClosed(positiveResult);
-
-		if (positiveResult) {
-			final Calendar c = Calendar.getInstance();
-			c.set(Calendar.MINUTE, picker.getCurrentMinute());
-			c.set(Calendar.HOUR_OF_DAY, picker.getCurrentHour());
-
-
-			if (!callChangeListener(c.getTimeInMillis())) {
-				return;
-			}
-
-			setTime(c.getTimeInMillis());
-		}
-	}
-
-	@Override
-	protected Object onGetDefaultValue(final TypedArray a, final int index) {
-		return a.getInteger(index, 0);
-	}
-
-	@Override
-	protected void onSetInitialValue(final boolean restorePersistedValue, final Object defaultValue) {
-		long time;
-		if (defaultValue == null) {
-			time = restorePersistedValue ? getPersistedLong(DEFAULT_VALUE) : DEFAULT_VALUE;
-		} else if (defaultValue instanceof Long) {
-			time = restorePersistedValue ? getPersistedLong((Long) defaultValue) : (Long) defaultValue;
-		} else if (defaultValue instanceof Calendar) {
-			time = restorePersistedValue ? getPersistedLong(((Calendar)defaultValue).getTimeInMillis()) : ((Calendar)defaultValue).getTimeInMillis();
-		} else {
-			time = restorePersistedValue ? getPersistedLong(DEFAULT_VALUE) : DEFAULT_VALUE;
-		}
-
-		setTime(time);
-		updateSummary(time);
-	}
-
-	@Override
-	public boolean onPreferenceChange(final Preference preference, final Object newValue) {
-		((TimePreference) preference).updateSummary((Long)newValue);
-		return true;
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/eu/siacs/conversations/ui/UiCallback.java
deleted file mode 100644
index c80199e1..00000000
--- a/src/main/java/eu/siacs/conversations/ui/UiCallback.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.PendingIntent;
-
-public interface UiCallback<T> {
-	public void success(T object);
-
-	public void error(int errorCode, T object);
-
-	public void userInputRequried(PendingIntent pi, T object);
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
deleted file mode 100644
index ec9d59e1..00000000
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ /dev/null
@@ -1,446 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.app.ActionBar;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.View;
-import android.widget.Button;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.google.zxing.integration.android.IntentIntegrator;
-import com.google.zxing.integration.android.IntentResult;
-
-import net.java.otr4j.OtrException;
-import net.java.otr4j.session.Session;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.XmppUri;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public class VerifyOTRActivity extends XmppActivity implements XmppConnectionService.OnConversationUpdate {
-
-	public static final String ACTION_VERIFY_CONTACT = "verify_contact";
-	public static final int MODE_SCAN_FINGERPRINT = - 0x0502;
-	public static final int MODE_ASK_QUESTION = 0x0503;
-	public static final int MODE_ANSWER_QUESTION = 0x0504;
-	public static final int MODE_MANUAL_VERIFICATION = 0x0505;
-
-	private LinearLayout mManualVerificationArea;
-	private LinearLayout mSmpVerificationArea;
-	private TextView mRemoteFingerprint;
-	private TextView mYourFingerprint;
-	private TextView mVerificationExplain;
-	private TextView mStatusMessage;
-	private TextView mSharedSecretHint;
-	private EditText mSharedSecretHintEditable;
-	private EditText mSharedSecretSecret;
-	private Button mLeftButton;
-	private Button mRightButton;
-	private Account mAccount;
-	private Conversation mConversation;
-	private int mode = MODE_MANUAL_VERIFICATION;
-	private XmppUri mPendingUri = null;
-
-	private DialogInterface.OnClickListener mVerifyFingerprintListener = new DialogInterface.OnClickListener() {
-
-		@Override
-		public void onClick(DialogInterface dialogInterface, int click) {
-			mConversation.verifyOtrFingerprint();
-			xmppConnectionService.syncRosterToDisk(mConversation.getAccount());
-			Toast.makeText(VerifyOTRActivity.this,R.string.verified,Toast.LENGTH_SHORT).show();
-			finish();
-		}
-	};
-
-	private View.OnClickListener mCreateSharedSecretListener = new View.OnClickListener() {
-		@Override
-		public void onClick(final View view) {
-			if (isAccountOnline()) {
-				final String question = mSharedSecretHintEditable.getText().toString();
-				final String secret = mSharedSecretSecret.getText().toString();
-				if (question.trim().isEmpty()) {
-					mSharedSecretHintEditable.requestFocus();
-					mSharedSecretHintEditable.setError(getString(R.string.shared_secret_hint_should_not_be_empty));
-				} else if (secret.trim().isEmpty()) {
-					mSharedSecretSecret.requestFocus();
-					mSharedSecretSecret.setError(getString(R.string.shared_secret_can_not_be_empty));
-				} else {
-					mSharedSecretSecret.setError(null);
-					mSharedSecretHintEditable.setError(null);
-					initSmp(question, secret);
-					updateView();
-				}
-			}
-		}
-	};
-	private View.OnClickListener mCancelSharedSecretListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			if (isAccountOnline()) {
-				abortSmp();
-				updateView();
-			}
-		}
-	};
-	private View.OnClickListener mRespondSharedSecretListener = new View.OnClickListener() {
-
-		@Override
-		public void onClick(View view) {
-			if (isAccountOnline()) {
-				final String question = mSharedSecretHintEditable.getText().toString();
-				final String secret = mSharedSecretSecret.getText().toString();
-				respondSmp(question, secret);
-				updateView();
-			}
-		}
-	};
-	private View.OnClickListener mRetrySharedSecretListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			mConversation.smp().status = Conversation.Smp.STATUS_NONE;
-			mConversation.smp().hint = null;
-			mConversation.smp().secret = null;
-			updateView();
-		}
-	};
-	private View.OnClickListener mFinishListener = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			mConversation.smp().status = Conversation.Smp.STATUS_NONE;
-			finish();
-		}
-	};
-
-	protected boolean initSmp(final String question, final String secret) {
-		final Session session = mConversation.getOtrSession();
-		if (session!=null) {
-			try {
-				session.initSmp(question, secret);
-				mConversation.smp().status = Conversation.Smp.STATUS_WE_REQUESTED;
-				mConversation.smp().secret = secret;
-				mConversation.smp().hint = question;
-				return true;
-			} catch (OtrException e) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	protected boolean abortSmp() {
-		final Session session = mConversation.getOtrSession();
-		if (session!=null) {
-			try {
-				session.abortSmp();
-				mConversation.smp().status = Conversation.Smp.STATUS_NONE;
-				mConversation.smp().hint = null;
-				mConversation.smp().secret = null;
-				return true;
-			} catch (OtrException e) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	protected boolean respondSmp(final String question, final String secret) {
-		final Session session = mConversation.getOtrSession();
-		if (session!=null) {
-			try {
-				session.respondSmp(question,secret);
-				return true;
-			} catch (OtrException e) {
-				return false;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	protected boolean verifyWithUri(XmppUri uri) {
-		Contact contact = mConversation.getContact();
-		if (this.mConversation.getContact().getJid().equals(uri.getJid()) && uri.getFingerprint() != null) {
-			contact.addOtrFingerprint(uri.getFingerprint());
-			Toast.makeText(this,R.string.verified,Toast.LENGTH_SHORT).show();
-			updateView();
-			xmppConnectionService.syncRosterToDisk(contact.getAccount());
-			return true;
-		} else {
-			Toast.makeText(this,R.string.could_not_verify_fingerprint,Toast.LENGTH_SHORT).show();
-			return false;
-		}
-	}
-
-	protected boolean isAccountOnline() {
-		if (this.mAccount.getStatus() != Account.State.ONLINE) {
-			Toast.makeText(this,R.string.not_connected_try_again,Toast.LENGTH_SHORT).show();
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	protected boolean handleIntent(Intent intent) {
-		if (intent != null && intent.getAction().equals(ACTION_VERIFY_CONTACT)) {
-			try {
-				this.mAccount = this.xmppConnectionService.findAccountByJid(Jid.fromString(intent.getExtras().getString("account")));
-			} catch (final InvalidJidException ignored) {
-				return false;
-			}
-			try {
-				this.mConversation = this.xmppConnectionService.find(this.mAccount,Jid.fromString(intent.getExtras().getString("contact")));
-				if (this.mConversation == null) {
-					return false;
-				}
-			} catch (final InvalidJidException ignored) {
-				return false;
-			}
-			this.mode = intent.getIntExtra("mode", MODE_MANUAL_VERIFICATION);
-			if (this.mode == MODE_SCAN_FINGERPRINT) {
-				new IntentIntegrator(this).initiateScan();
-				return false;
-			}
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	@Override
-	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
-		if ((requestCode & 0xFFFF) == IntentIntegrator.REQUEST_CODE) {
-			IntentResult scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, intent);
-			if (scanResult != null && scanResult.getFormatName() != null) {
-				String data = scanResult.getContents();
-				XmppUri uri = new XmppUri(data);
-				if (xmppConnectionServiceBound) {
-					verifyWithUri(uri);
-					finish();
-				} else {
-					this.mPendingUri = uri;
-				}
-			} else {
-				finish();
-			}
-		}
-		super.onActivityResult(requestCode, requestCode, intent);
-	}
-
-	@Override
-	protected void onBackendConnected() {
-		if (handleIntent(getIntent())) {
-			updateView();
-		} else if (mPendingUri!=null) {
-			verifyWithUri(mPendingUri);
-			finish();
-			mPendingUri = null;
-		}
-		setIntent(null);
-	}
-
-	protected void updateView() {
-		if (this.mConversation.hasValidOtrSession()) {
-			final ActionBar actionBar = getActionBar();
-			this.mVerificationExplain.setText(R.string.no_otr_session_found);
-			invalidateOptionsMenu();
-			switch(this.mode) {
-				case MODE_ASK_QUESTION:
-					if (actionBar != null ) {
-						actionBar.setTitle(R.string.ask_question);
-					}
-					this.updateViewAskQuestion();
-					break;
-				case MODE_ANSWER_QUESTION:
-					if (actionBar != null ) {
-						actionBar.setTitle(R.string.smp_requested);
-					}
-					this.updateViewAnswerQuestion();
-					break;
-				case MODE_MANUAL_VERIFICATION:
-				default:
-					if (actionBar != null ) {
-						actionBar.setTitle(R.string.manually_verify);
-					}
-					this.updateViewManualVerification();
-					break;
-			}
-		} else {
-			this.mManualVerificationArea.setVisibility(View.GONE);
-			this.mSmpVerificationArea.setVisibility(View.GONE);
-		}
-	}
-
-	protected void updateViewManualVerification() {
-		this.mVerificationExplain.setText(R.string.manual_verification_explanation);
-		this.mManualVerificationArea.setVisibility(View.VISIBLE);
-		this.mSmpVerificationArea.setVisibility(View.GONE);
-		this.mYourFingerprint.setText(CryptoHelper.prettifyFingerprint(this.mAccount.getOtrFingerprint()));
-		this.mRemoteFingerprint.setText(CryptoHelper.prettifyFingerprint(this.mConversation.getOtrFingerprint()));
-		if (this.mConversation.isOtrFingerprintVerified()) {
-			deactivateButton(this.mRightButton,R.string.verified);
-			activateButton(this.mLeftButton,R.string.cancel,this.mFinishListener);
-		} else {
-			activateButton(this.mLeftButton,R.string.cancel,this.mFinishListener);
-			activateButton(this.mRightButton,R.string.verify, new View.OnClickListener() {
-				@Override
-				public void onClick(View view) {
-					showManuallyVerifyDialog();
-				}
-			});
-		}
-	}
-
-	protected void updateViewAskQuestion() {
-		this.mManualVerificationArea.setVisibility(View.GONE);
-		this.mSmpVerificationArea.setVisibility(View.VISIBLE);
-		this.mVerificationExplain.setText(R.string.smp_explain_question);
-		final int smpStatus = this.mConversation.smp().status;
-		switch (smpStatus) {
-			case Conversation.Smp.STATUS_WE_REQUESTED:
-				this.mStatusMessage.setVisibility(View.GONE);
-				this.mSharedSecretHintEditable.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.setVisibility(View.VISIBLE);
-				this.mSharedSecretHintEditable.setText(this.mConversation.smp().hint);
-				this.mSharedSecretSecret.setText(this.mConversation.smp().secret);
-				this.activateButton(this.mLeftButton, R.string.cancel, this.mCancelSharedSecretListener);
-				this.deactivateButton(this.mRightButton, R.string.in_progress);
-				break;
-			case Conversation.Smp.STATUS_FAILED:
-				this.mStatusMessage.setVisibility(View.GONE);
-				this.mSharedSecretHintEditable.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.requestFocus();
-				this.mSharedSecretSecret.setError(getString(R.string.secrets_do_not_match));
-				this.deactivateButton(this.mLeftButton, R.string.cancel);
-				this.activateButton(this.mRightButton, R.string.try_again, this.mRetrySharedSecretListener);
-				break;
-			case Conversation.Smp.STATUS_VERIFIED:
-				this.mSharedSecretHintEditable.setText("");
-				this.mSharedSecretHintEditable.setVisibility(View.GONE);
-				this.mSharedSecretSecret.setText("");
-				this.mSharedSecretSecret.setVisibility(View.GONE);
-				this.mStatusMessage.setVisibility(View.VISIBLE);
-				this.deactivateButton(this.mLeftButton, R.string.cancel);
-				this.activateButton(this.mRightButton, R.string.finish, this.mFinishListener);
-				break;
-			default:
-				this.mStatusMessage.setVisibility(View.GONE);
-				this.mSharedSecretHintEditable.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.setVisibility(View.VISIBLE);
-				this.activateButton(this.mLeftButton,R.string.cancel,this.mFinishListener);
-				this.activateButton(this.mRightButton, R.string.ask_question, this.mCreateSharedSecretListener);
-				break;
-		}
-	}
-
-	protected void updateViewAnswerQuestion() {
-		this.mManualVerificationArea.setVisibility(View.GONE);
-		this.mSmpVerificationArea.setVisibility(View.VISIBLE);
-		this.mVerificationExplain.setText(R.string.smp_explain_answer);
-		this.mSharedSecretHintEditable.setVisibility(View.GONE);
-		this.mSharedSecretHint.setVisibility(View.VISIBLE);
-		this.deactivateButton(this.mLeftButton, R.string.cancel);
-		final int smpStatus = this.mConversation.smp().status;
-		switch (smpStatus) {
-			case Conversation.Smp.STATUS_CONTACT_REQUESTED:
-				this.mStatusMessage.setVisibility(View.GONE);
-				this.mSharedSecretHint.setText(this.mConversation.smp().hint);
-				this.activateButton(this.mRightButton,R.string.respond,this.mRespondSharedSecretListener);
-				break;
-			case Conversation.Smp.STATUS_VERIFIED:
-				this.mSharedSecretHintEditable.setText("");
-				this.mSharedSecretHintEditable.setVisibility(View.GONE);
-				this.mSharedSecretHint.setVisibility(View.GONE);
-				this.mSharedSecretSecret.setText("");
-				this.mSharedSecretSecret.setVisibility(View.GONE);
-				this.mStatusMessage.setVisibility(View.VISIBLE);
-				this.activateButton(this.mRightButton, R.string.finish, this.mFinishListener);
-				break;
-			case Conversation.Smp.STATUS_FAILED:
-			default:
-				this.mSharedSecretSecret.requestFocus();
-				this.mSharedSecretSecret.setError(getString(R.string.secrets_do_not_match));
-				this.activateButton(this.mRightButton,R.string.finish,this.mFinishListener);
-				break;
-		}
-	}
-
-	protected void activateButton(Button button, int text, View.OnClickListener listener) {
-		button.setEnabled(true);
-		button.setTextColor(getPrimaryTextColor());
-		button.setText(text);
-		button.setOnClickListener(listener);
-	}
-
-	protected void deactivateButton(Button button, int text) {
-		button.setEnabled(false);
-		button.setTextColor(getSecondaryTextColor());
-		button.setText(text);
-		button.setOnClickListener(null);
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_verify_otr);
-		this.mRemoteFingerprint = (TextView) findViewById(R.id.remote_fingerprint);
-		this.mYourFingerprint = (TextView) findViewById(R.id.your_fingerprint);
-		this.mLeftButton = (Button) findViewById(R.id.left_button);
-		this.mRightButton = (Button) findViewById(R.id.right_button);
-		this.mVerificationExplain = (TextView) findViewById(R.id.verification_explanation);
-		this.mStatusMessage = (TextView) findViewById(R.id.status_message);
-		this.mSharedSecretSecret = (EditText) findViewById(R.id.shared_secret_secret);
-		this.mSharedSecretHintEditable = (EditText) findViewById(R.id.shared_secret_hint_editable);
-		this.mSharedSecretHint = (TextView) findViewById(R.id.shared_secret_hint);
-		this.mManualVerificationArea = (LinearLayout) findViewById(R.id.manual_verification_area);
-		this.mSmpVerificationArea = (LinearLayout) findViewById(R.id.smp_verification_area);
-	}
-
-	@Override
-	public boolean onCreateOptionsMenu(final Menu menu) {
-		super.onCreateOptionsMenu(menu);
-		getMenuInflater().inflate(R.menu.verify_otr, menu);
-		return true;
-	}
-
-	private void showManuallyVerifyDialog() {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(R.string.manually_verify);
-		builder.setMessage(R.string.are_you_sure_verify_fingerprint);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.verify, mVerifyFingerprintListener);
-		builder.create().show();
-	}
-
-	@Override
-	protected String getShareableUri() {
-		if (mAccount!=null) {
-			return mAccount.getShareableUri();
-		} else {
-			return "";
-		}
-	}
-
-	public void onConversationUpdate() {
-		refreshUi();
-	}
-
-	@Override
-	protected void refreshUiReal() {
-		updateView();
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
deleted file mode 100644
index 62f62b9a..00000000
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ /dev/null
@@ -1,957 +0,0 @@
-package eu.siacs.conversations.ui;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.app.ActionBar;
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.AlertDialog.Builder;
-import android.app.PendingIntent;
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.content.Intent;
-import android.content.IntentSender.SendIntentException;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcEvent;
-import android.os.AsyncTask;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.SystemClock;
-import android.preference.PreferenceManager;
-import android.text.InputType;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.EncodeHintType;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
-import com.google.zxing.qrcode.QRCodeWriter;
-import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
-
-import net.java.otr4j.session.SessionID;
-
-import java.io.FileNotFoundException;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-
-import de.tzur.conversations.Settings;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.MucOptions;
-import eu.siacs.conversations.entities.Presences;
-import eu.siacs.conversations.services.AvatarService;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.services.XmppConnectionService.XmppConnectionBinder;
-import eu.siacs.conversations.utils.ExceptionHelper;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.jid.InvalidJidException;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-public abstract class XmppActivity extends Activity {
-
-	protected static final int REQUEST_ANNOUNCE_PGP = 0x0101;
-	protected static final int REQUEST_INVITE_TO_CONVERSATION = 0x0102;
-
-	public XmppConnectionService xmppConnectionService;
-	public boolean xmppConnectionServiceBound = false;
-	protected boolean registeredListeners = false;
-
-	protected int mPrimaryTextColor;
-	protected int mSecondaryTextColor;
-	protected int mSecondaryBackgroundColor;
-	protected int mColorRed;
-	protected int mColorOrange;
-	protected int mColorGreen;
-	protected int mPrimaryColor;
-
-	protected boolean mUseSubject = true;
-
-	private DisplayMetrics metrics;
-	protected int mTheme;
-	protected boolean mUsingEnterKey = false;
-
-	private long mLastUiRefresh = 0;
-	private Handler mRefreshUiHandler = new Handler();
-	private Runnable mRefreshUiRunnable = new Runnable() {
-		@Override
-		public void run() {
-			mLastUiRefresh = SystemClock.elapsedRealtime();
-			refreshUiReal();
-		}
-	};
-
-
-	protected void refreshUi() {
-		final long diff = SystemClock.elapsedRealtime() - mLastUiRefresh;
-		if (diff > Config.REFRESH_UI_INTERVAL) {
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			runOnUiThread(mRefreshUiRunnable);
-		} else {
-			final long next = Config.REFRESH_UI_INTERVAL - diff;
-			mRefreshUiHandler.removeCallbacks(mRefreshUiRunnable);
-			mRefreshUiHandler.postDelayed(mRefreshUiRunnable,next);
-		}
-	}
-
-	protected void refreshUiReal() {
-
-	};
-
-	protected interface OnValueEdited {
-		public void onValueEdited(String value);
-	}
-
-	public interface OnPresenceSelected {
-		public void onPresenceSelected();
-	}
-
-	protected ServiceConnection mConnection = new ServiceConnection() {
-
-		@Override
-		public void onServiceConnected(ComponentName className, IBinder service) {
-			XmppConnectionBinder binder = (XmppConnectionBinder) service;
-			xmppConnectionService = binder.getService();
-			xmppConnectionServiceBound = true;
-			if (!registeredListeners && shouldRegisterListeners()) {
-				registerListeners();
-				registeredListeners = true;
-			}
-			onBackendConnected();
-		}
-
-		@Override
-		public void onServiceDisconnected(ComponentName arg0) {
-			xmppConnectionServiceBound = false;
-		}
-	};
-
-	@Override
-	protected void onStart() {
-		super.onStart();
-		if (!xmppConnectionServiceBound) {
-			connectToBackend();
-		} else {
-			if (!registeredListeners) {
-				this.registerListeners();
-				this.registeredListeners = true;
-			}
-			this.onBackendConnected();
-		}
-	}
-
-	@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-	protected boolean shouldRegisterListeners() {
-		if  (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-			return !isDestroyed() && !isFinishing();
-		} else {
-			return !isFinishing();
-		}
-	}
-
-	public void connectToBackend() {
-		Intent intent = new Intent(this, XmppConnectionService.class);
-		intent.setAction("ui");
-		startService(intent);
-		bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-		if (xmppConnectionServiceBound) {
-			if (registeredListeners) {
-				this.unregisterListeners();
-				this.registeredListeners = false;
-			}
-			unbindService(mConnection);
-			xmppConnectionServiceBound = false;
-		}
-	}
-
-	protected void hideKeyboard() {
-		InputMethodManager inputManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-
-		View focus = getCurrentFocus();
-
-		if (focus != null) {
-
-			inputManager.hideSoftInputFromWindow(focus.getWindowToken(),
-					InputMethodManager.HIDE_NOT_ALWAYS);
-		}
-	}
-
-	public boolean hasPgp() {
-		return xmppConnectionService.getPgpEngine() != null;
-	}
-
-	public void showInstallPgpDialog() {
-		Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(getString(R.string.openkeychain_required));
-		builder.setIconAttribute(android.R.attr.alertDialogIcon);
-		builder.setMessage(getText(R.string.openkeychain_required_long));
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setNeutralButton(getString(R.string.restart),
-				new OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (xmppConnectionServiceBound) {
-							unbindService(mConnection);
-							xmppConnectionServiceBound = false;
-						}
-						stopService(new Intent(XmppActivity.this,
-									XmppConnectionService.class));
-						finish();
-					}
-				});
-		builder.setPositiveButton(getString(R.string.install),
-				new OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						Uri uri = Uri
-							.parse("market://details?id=org.sufficientlysecure.keychain");
-						Intent marketIntent = new Intent(Intent.ACTION_VIEW,
-								uri);
-						PackageManager manager = getApplicationContext()
-							.getPackageManager();
-						List<ResolveInfo> infos = manager
-							.queryIntentActivities(marketIntent, 0);
-						if (infos.size() > 0) {
-							startActivity(marketIntent);
-						} else {
-							uri = Uri.parse("http://www.openkeychain.org/");
-							Intent browserIntent = new Intent(
-									Intent.ACTION_VIEW, uri);
-							startActivity(browserIntent);
-						}
-						finish();
-					}
-				});
-		builder.create().show();
-	}
-
-	abstract void onBackendConnected();
-
-	protected void registerListeners() {
-		if (this instanceof XmppConnectionService.OnConversationUpdate) {
-			this.xmppConnectionService.setOnConversationListChangedListener((XmppConnectionService.OnConversationUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnAccountUpdate) {
-			this.xmppConnectionService.setOnAccountListChangedListener((XmppConnectionService.OnAccountUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnRosterUpdate) {
-			this.xmppConnectionService.setOnRosterUpdateListener((XmppConnectionService.OnRosterUpdate) this);
-		}
-		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-			this.xmppConnectionService.setOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
-		}
-		if (this instanceof OnUpdateBlocklist) {
-			this.xmppConnectionService.setOnUpdateBlocklistListener((OnUpdateBlocklist) this);
-		}
-	}
-
-	protected void unregisterListeners() {
-		if (this instanceof XmppConnectionService.OnConversationUpdate) {
-			this.xmppConnectionService.removeOnConversationListChangedListener();
-		}
-		if (this instanceof XmppConnectionService.OnAccountUpdate) {
-			this.xmppConnectionService.removeOnAccountListChangedListener();
-		}
-		if (this instanceof XmppConnectionService.OnRosterUpdate) {
-			this.xmppConnectionService.removeOnRosterUpdateListener();
-		}
-		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
-			this.xmppConnectionService.removeOnMucRosterUpdateListener();
-		}
-		if (this instanceof OnUpdateBlocklist) {
-			this.xmppConnectionService.removeOnUpdateBlocklistListener();
-		}
-	}
-
-	@Override
-	public boolean onOptionsItemSelected(final MenuItem item) {
-		switch (item.getItemId()) {
-			case R.id.action_settings:
-				startActivity(new Intent(this, SettingsActivity.class));
-				break;
-			case R.id.action_accounts:
-				startActivity(new Intent(this, ManageAccountActivity.class));
-				break;
-			case android.R.id.home:
-				finish();
-				break;
-			case R.id.action_show_qr_code:
-				showQrCode();
-				break;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		metrics = getResources().getDisplayMetrics();
-		ExceptionHelper.init(getApplicationContext());
-		mPrimaryTextColor = getResources().getColor(R.color.primarytext);
-		mSecondaryTextColor = getResources().getColor(R.color.secondarytext);
-		mColorRed = getResources().getColor(R.color.red);
-		mColorOrange = getResources().getColor(R.color.orange);
-		mColorGreen = getResources().getColor(R.color.green);
-		mPrimaryColor = getResources().getColor(R.color.primary);
-		mSecondaryBackgroundColor = getResources().getColor(R.color.secondarybackground);
-		this.mTheme = findTheme();
-		setTheme(this.mTheme);
-		this.mUsingEnterKey = usingEnterKey();
-		mUseSubject = getPreferences().getBoolean("use_subject", true);
-		
-        Settings.initSettingsClassWithPreferences(getPreferences());
-		
-		final ActionBar ab = getActionBar();
-		if (ab!=null) {
-			ab.setDisplayHomeAsUpEnabled(true);
-		}
-	}
-
-	protected boolean usingEnterKey() {
-		return getPreferences().getBoolean("display_enter_key", false);
-	}
-
-	protected SharedPreferences getPreferences() {
-		return PreferenceManager
-			.getDefaultSharedPreferences(getApplicationContext());
-	}
-
-	public boolean useSubjectToIdentifyConference() {
-		return mUseSubject;
-	}
-
-	public void switchToConversation(Conversation conversation) {
-		switchToConversation(conversation, null, false);
-	}
-
-	public void switchToConversation(Conversation conversation, String text,
-			boolean newTask) {
-		switchToConversation(conversation,text,null,newTask);
-	}
-
-	public void highlightInMuc(Conversation conversation, String nick) {
-		switchToConversation(conversation,null,nick,false);
-	}
-
-	private void switchToConversation(Conversation conversation, String text, String nick, boolean newTask) {
-		Intent viewConversationIntent = new Intent(this,
-				ConversationActivity.class);
-		viewConversationIntent.setAction(Intent.ACTION_VIEW);
-		viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
-				conversation.getUuid());
-		if (text != null) {
-			viewConversationIntent.putExtra(ConversationActivity.TEXT, text);
-		}
-		if (nick != null) {
-			viewConversationIntent.putExtra(ConversationActivity.NICK, nick);
-		}
-		viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION);
-		if (newTask) {
-			viewConversationIntent.setFlags(viewConversationIntent.getFlags()
-					| Intent.FLAG_ACTIVITY_NEW_TASK
-					| Intent.FLAG_ACTIVITY_SINGLE_TOP);
-		} else {
-			viewConversationIntent.setFlags(viewConversationIntent.getFlags()
-					| Intent.FLAG_ACTIVITY_CLEAR_TOP);
-		}
-		startActivity(viewConversationIntent);
-		finish();
-	}
-
-	public void switchToContactDetails(Contact contact) {
-		Intent intent = new Intent(this, ContactDetailsActivity.class);
-		intent.setAction(ContactDetailsActivity.ACTION_VIEW_CONTACT);
-		intent.putExtra("account", contact.getAccount().getJid().toBareJid().toString());
-		intent.putExtra("contact", contact.getJid().toString());
-		startActivity(intent);
-	}
-
-	public void switchToAccount(Account account) {
-		Intent intent = new Intent(this, EditAccountActivity.class);
-		intent.putExtra("jid", account.getJid().toBareJid().toString());
-		startActivity(intent);
-	}
-
-	protected void inviteToConversation(Conversation conversation) {
-		Intent intent = new Intent(getApplicationContext(),
-				ChooseContactActivity.class);
-		List<String> contacts = new ArrayList<>();
-		if (conversation.getMode() == Conversation.MODE_MULTI) {
-			for (MucOptions.User user : conversation.getMucOptions().getUsers()) {
-				Jid jid = user.getJid();
-				if (jid != null) {
-					contacts.add(jid.toBareJid().toString());
-				}
-			}
-		} else {
-			contacts.add(conversation.getJid().toBareJid().toString());
-		}
-		intent.putExtra("filter_contacts", contacts.toArray(new String[contacts.size()]));
-		intent.putExtra("conversation", conversation.getUuid());
-		intent.putExtra("multiple", true);
-		startActivityForResult(intent, REQUEST_INVITE_TO_CONVERSATION);
-	}
-
-	protected void announcePgp(Account account, final Conversation conversation) {
-		xmppConnectionService.getPgpEngine().generateSignature(account,
-				"online", new UiCallback<Account>() {
-
-					@Override
-					public void userInputRequried(PendingIntent pi,
-							Account account) {
-						try {
-							startIntentSenderForResult(pi.getIntentSender(),
-									REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
-						} catch (final SendIntentException ignored) {
-						}
-					}
-
-					@Override
-					public void success(Account account) {
-						xmppConnectionService.databaseBackend
-							.updateAccount(account);
-						xmppConnectionService.sendPresence(account);
-						if (conversation != null) {
-							conversation
-								.setNextEncryption(Message.ENCRYPTION_PGP);
-							xmppConnectionService.databaseBackend
-								.updateConversation(conversation);
-						}
-					}
-
-					@Override
-					public void error(int error, Account account) {
-						displayErrorDialog(error);
-					}
-				});
-	}
-
-	protected void displayErrorDialog(final int errorCode) {
-		runOnUiThread(new Runnable() {
-
-			@Override
-			public void run() {
-				AlertDialog.Builder builder = new AlertDialog.Builder(
-						XmppActivity.this);
-				builder.setIconAttribute(android.R.attr.alertDialogIcon);
-				builder.setTitle(getString(R.string.error));
-				builder.setMessage(errorCode);
-				builder.setNeutralButton(R.string.accept, null);
-				builder.create().show();
-			}
-		});
-
-	}
-
-	protected void showAddToRosterDialog(final Conversation conversation) {
-		showAddToRosterDialog(conversation.getContact());
-	}
-
-	protected void showAddToRosterDialog(final Contact contact) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(contact.getJid().toString());
-		builder.setMessage(getString(R.string.not_in_roster));
-		builder.setNegativeButton(getString(R.string.cancel), null);
-		builder.setPositiveButton(getString(R.string.add_contact),
-				new DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						final Jid jid = contact.getJid();
-						Account account = contact.getAccount();
-						Contact contact = account.getRoster().getContact(jid);
-						xmppConnectionService.createContact(contact);
-					}
-				});
-		builder.create().show();
-	}
-
-	private void showAskForPresenceDialog(final Contact contact) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(contact.getJid().toString());
-		builder.setMessage(R.string.request_presence_updates);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.request_now,
-				new DialogInterface.OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						if (xmppConnectionServiceBound) {
-							xmppConnectionService.sendPresencePacket(contact
-									.getAccount(), xmppConnectionService
-									.getPresenceGenerator()
-									.requestPresenceUpdatesFrom(contact));
-						}
-					}
-				});
-		builder.create().show();
-	}
-
-	private void warnMutalPresenceSubscription(final Conversation conversation,
-			final OnPresenceSelected listener) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		builder.setTitle(conversation.getContact().getJid().toString());
-		builder.setMessage(R.string.without_mutual_presence_updates);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.setPositiveButton(R.string.ignore, new OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				conversation.setNextCounterpart(null);
-				if (listener != null) {
-					listener.onPresenceSelected();
-				}
-			}
-		});
-		builder.create().show();
-	}
-
-	protected void quickEdit(String previousValue, OnValueEdited callback) {
-		quickEdit(previousValue, callback, false);
-	}
-
-	protected void quickPasswordEdit(String previousValue,
-			OnValueEdited callback) {
-		quickEdit(previousValue, callback, true);
-	}
-
-	@SuppressLint("InflateParams")
-	private void quickEdit(final String previousValue,
-			final OnValueEdited callback, boolean password) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
-		View view = getLayoutInflater().inflate(R.layout.quickedit, null);
-		final EditText editor = (EditText) view.findViewById(R.id.editor);
-		OnClickListener mClickListener = new OnClickListener() {
-
-			@Override
-			public void onClick(DialogInterface dialog, int which) {
-				String value = editor.getText().toString();
-				if (!previousValue.equals(value) && value.trim().length() > 0) {
-					callback.onValueEdited(value);
-				}
-			}
-		};
-		if (password) {
-			editor.setInputType(InputType.TYPE_CLASS_TEXT
-					| InputType.TYPE_TEXT_VARIATION_PASSWORD);
-			editor.setHint(R.string.password);
-			builder.setPositiveButton(R.string.accept, mClickListener);
-		} else {
-			builder.setPositiveButton(R.string.edit, mClickListener);
-		}
-		editor.requestFocus();
-		editor.setText(previousValue);
-		builder.setView(view);
-		builder.setNegativeButton(R.string.cancel, null);
-		builder.create().show();
-	}
-
-	public void selectPresence(final Conversation conversation,
-			final OnPresenceSelected listener) {
-		final Contact contact = conversation.getContact();
-		if (conversation.hasValidOtrSession()) {
-			SessionID id = conversation.getOtrSession().getSessionID();
-			Jid jid;
-			try {
-				jid = Jid.fromString(id.getAccountID() + "/" + id.getUserID());
-			} catch (InvalidJidException e) {
-				jid = null;
-			}
-			conversation.setNextCounterpart(jid);
-			listener.onPresenceSelected();
-		} else 	if (!contact.showInRoster()) {
-			showAddToRosterDialog(conversation);
-		} else {
-			Presences presences = contact.getPresences();
-			if (presences.size() == 0) {
-				if (!contact.getOption(Contact.Options.TO)
-						&& !contact.getOption(Contact.Options.ASKING)
-						&& contact.getAccount().getStatus() == Account.State.ONLINE) {
-					showAskForPresenceDialog(contact);
-				} else if (!contact.getOption(Contact.Options.TO)
-						|| !contact.getOption(Contact.Options.FROM)) {
-					warnMutalPresenceSubscription(conversation, listener);
-				} else {
-					conversation.setNextCounterpart(null);
-					listener.onPresenceSelected();
-				}
-			} else if (presences.size() == 1) {
-				String presence = presences.asStringArray()[0];
-				try {
-					conversation.setNextCounterpart(Jid.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence));
-				} catch (InvalidJidException e) {
-					conversation.setNextCounterpart(null);
-				}
-				listener.onPresenceSelected();
-			} else {
-				final StringBuilder presence = new StringBuilder();
-				AlertDialog.Builder builder = new AlertDialog.Builder(this);
-				builder.setTitle(getString(R.string.choose_presence));
-				final String[] presencesArray = presences.asStringArray();
-				int preselectedPresence = 0;
-				for (int i = 0; i < presencesArray.length; ++i) {
-					if (presencesArray[i].equals(contact.lastseen.presence)) {
-						preselectedPresence = i;
-						break;
-					}
-				}
-				presence.append(presencesArray[preselectedPresence]);
-				builder.setSingleChoiceItems(presencesArray,
-						preselectedPresence,
-						new DialogInterface.OnClickListener() {
-
-							@Override
-							public void onClick(DialogInterface dialog,
-									int which) {
-								presence.delete(0, presence.length());
-								presence.append(presencesArray[which]);
-							}
-						});
-				builder.setNegativeButton(R.string.cancel, null);
-				builder.setPositiveButton(R.string.ok, new OnClickListener() {
-
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						try {
-							conversation.setNextCounterpart(Jid.fromParts(contact.getJid().getLocalpart(),contact.getJid().getDomainpart(),presence.toString()));
-						} catch (InvalidJidException e) {
-							conversation.setNextCounterpart(null);
-						}
-						listener.onPresenceSelected();
-					}
-				});
-				builder.create().show();
-			}
-		}
-	}
-
-	protected void onActivityResult(int requestCode, int resultCode,
-			final Intent data) {
-		super.onActivityResult(requestCode, resultCode, data);
-		if (requestCode == REQUEST_INVITE_TO_CONVERSATION
-				&& resultCode == RESULT_OK) {
-			try {
-				String conversationUuid = data.getStringExtra("conversation");
-				Conversation conversation = xmppConnectionService
-					.findConversationByUuid(conversationUuid);
-				List<Jid> jids = new ArrayList<Jid>();
-				if (data.getBooleanExtra("multiple", false)) {
-					String[] toAdd = data.getStringArrayExtra("contacts");
-					for (String item : toAdd) {
-						jids.add(Jid.fromString(item));
-					}
-				} else {
-					jids.add(Jid.fromString(data.getStringExtra("contact")));
-				}
-
-				if (conversation.getMode() == Conversation.MODE_MULTI) {
-					for (Jid jid : jids) {
-						xmppConnectionService.invite(conversation, jid);
-					}
-				} else {
-					jids.add(conversation.getJid().toBareJid());
-					xmppConnectionService.createAdhocConference(conversation.getAccount(), jids, adhocCallback);
-				}
-			} catch (final InvalidJidException ignored) {
-
-			}
-		}
-	}
-
-	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
-		@Override
-		public void success(final Conversation conversation) {
-			switchToConversation(conversation);
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(XmppActivity.this,R.string.conference_created,Toast.LENGTH_LONG).show();
-				}
-			});
-		}
-
-		@Override
-		public void error(final int errorCode, Conversation object) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(XmppActivity.this,errorCode,Toast.LENGTH_LONG).show();
-				}
-			});
-		}
-
-		@Override
-		public void userInputRequried(PendingIntent pi, Conversation object) {
-
-		}
-	};
-
-	public int getSecondaryTextColor() {
-		return this.mSecondaryTextColor;
-	}
-
-	public int getPrimaryTextColor() {
-		return this.mPrimaryTextColor;
-	}
-
-	public int getWarningTextColor() {
-		return this.mColorRed;
-	}
-
-	public int getPrimaryColor() {
-		return this.mPrimaryColor;
-	}
-
-	public int getOnlineColor() {
-		return this.mColorGreen;
-	}
-	
-	public int getSecondaryBackgroundColor() {
-		return this.mSecondaryBackgroundColor;
-	}
-
-	public int getPixel(int dp) {
-		DisplayMetrics metrics = getResources().getDisplayMetrics();
-		return ((int) (dp * metrics.density));
-	}
-
-	public boolean copyTextToClipboard(String text, int labelResId) {
-		ClipboardManager mClipBoardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-		String label = getResources().getString(labelResId);
-		if (mClipBoardManager != null) {
-			ClipData mClipData = ClipData.newPlainText(label, text);
-			mClipBoardManager.setPrimaryClip(mClipData);
-			return true;
-		}
-		return false;
-	}
-
-	protected void registerNdefPushMessageCallback() {
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-		if (nfcAdapter != null && nfcAdapter.isEnabled()) {
-			nfcAdapter.setNdefPushMessageCallback(new NfcAdapter.CreateNdefMessageCallback() {
-				@Override
-				public NdefMessage createNdefMessage(NfcEvent nfcEvent) {
-					return new NdefMessage(new NdefRecord[]{
-						NdefRecord.createUri(getShareableUri()),
-							NdefRecord.createApplicationRecord("eu.siacs.conversations")
-					});
-				}
-			}, this);
-		}
-	}
-
-	protected void unregisterNdefPushMessageCallback() {
-		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
-		if (nfcAdapter != null && nfcAdapter.isEnabled()) {
-			nfcAdapter.setNdefPushMessageCallback(null,this);
-		}
-	}
-
-	protected String getShareableUri() {
-		return null;
-	}
-
-	@Override
-	public void onResume() {
-		super.onResume();
-		if (this.getShareableUri()!=null) {
-			this.registerNdefPushMessageCallback();
-		}
-	}
-
-	protected int findTheme() {
-		if (getPreferences().getBoolean("use_larger_font", false)) {
-			return R.style.ConversationsTheme_LargerText;
-		} else {
-			return R.style.ConversationsTheme;
-		}
-	}
-
-	@Override
-	public void onPause() {
-		super.onPause();
-		this.unregisterNdefPushMessageCallback();
-	}
-
-	protected void showQrCode() {
-		String uri = getShareableUri();
-		if (uri!=null) {
-			Point size = new Point();
-			getWindowManager().getDefaultDisplay().getSize(size);
-			final int width = (size.x < size.y ? size.x : size.y);
-			Bitmap bitmap = createQrCodeBitmap(uri, width);
-			ImageView view = new ImageView(this);
-			view.setImageBitmap(bitmap);
-			AlertDialog.Builder builder = new AlertDialog.Builder(this);
-			builder.setView(view);
-			builder.create().show();
-		}
-	}
-
-	protected Bitmap createQrCodeBitmap(String input, int size) {
-		Log.d(Config.LOGTAG,"qr code requested size: "+size);
-		try {
-			final QRCodeWriter QR_CODE_WRITER = new QRCodeWriter();
-			final Hashtable<EncodeHintType, Object> hints = new Hashtable<>();
-			hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M);
-			final BitMatrix result = QR_CODE_WRITER.encode(input, BarcodeFormat.QR_CODE, size, size, hints);
-			final int width = result.getWidth();
-			final int height = result.getHeight();
-			final int[] pixels = new int[width * height];
-			for (int y = 0; y < height; y++) {
-				final int offset = y * width;
-				for (int x = 0; x < width; x++) {
-					pixels[offset + x] = result.get(x, y) ? Color.BLACK : Color.TRANSPARENT;
-				}
-			}
-			final Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-			Log.d(Config.LOGTAG,"output size: "+width+"x"+height);
-			bitmap.setPixels(pixels, 0, width, 0, 0, width, height);
-			return bitmap;
-		} catch (final WriterException e) {
-			return null;
-		}
-	}
-
-	public AvatarService avatarService() {
-		return xmppConnectionService.getAvatarService();
-	}
-
-	class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {
-		private final WeakReference<ImageView> imageViewReference;
-		private Message message = null;
-
-		public BitmapWorkerTask(ImageView imageView) {
-			imageViewReference = new WeakReference<>(imageView);
-		}
-
-		@Override
-		protected Bitmap doInBackground(Message... params) {
-			message = params[0];
-			try {
-				return xmppConnectionService.getFileBackend().getThumbnail(
-						message, (int) (metrics.density * 288), false);
-			} catch (FileNotFoundException e) {
-				return null;
-			}
-		}
-
-		@Override
-		protected void onPostExecute(Bitmap bitmap) {
-			if (bitmap != null) {
-				final ImageView imageView = imageViewReference.get();
-				if (imageView != null) {
-					imageView.setImageBitmap(bitmap);
-					imageView.setBackgroundColor(0x00000000);
-				}
-			}
-		}
-	}
-
-	public void loadBitmap(Message message, ImageView imageView) {
-		Bitmap bm;
-		try {
-			bm = xmppConnectionService.getFileBackend().getThumbnail(message,
-					(int) (metrics.density * 288), true);
-		} catch (FileNotFoundException e) {
-			bm = null;
-		}
-		if (bm != null) {
-			imageView.setImageBitmap(bm);
-			imageView.setBackgroundColor(0x00000000);
-		} else {
-			if (cancelPotentialWork(message, imageView)) {
-				imageView.setBackgroundColor(0xff333333);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(
-						getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(message);
-				} catch (final RejectedExecutionException ignored) {
-				}
-			}
-		}
-	}
-
-	public static boolean cancelPotentialWork(Message message,
-			ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final Message oldMessage = bitmapWorkerTask.message;
-			if (oldMessage == null || message != oldMessage) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	static class AsyncDrawable extends BitmapDrawable {
-		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
-
-		public AsyncDrawable(Resources res, Bitmap bitmap,
-				BitmapWorkerTask bitmapWorkerTask) {
-			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(
-					bitmapWorkerTask);
-		}
-
-		public BitmapWorkerTask getBitmapWorkerTask() {
-			return bitmapWorkerTaskReference.get();
-		}
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
deleted file mode 100644
index 29730914..00000000
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package eu.siacs.conversations.ui.adapter;
-
-import java.util.List;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.ui.XmppActivity;
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class AccountAdapter extends ArrayAdapter<Account> {
-
-	private XmppActivity activity;
-
-	public AccountAdapter(XmppActivity activity, List<Account> objects) {
-		super(activity, 0, objects);
-		this.activity = activity;
-	}
-
-	@Override
-	public View getView(int position, View view, ViewGroup parent) {
-		Account account = getItem(position);
-		if (view == null) {
-			LayoutInflater inflater = (LayoutInflater) getContext()
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			view = inflater.inflate(R.layout.account_row, parent, false);
-		}
-		TextView jid = (TextView) view.findViewById(R.id.account_jid);
-		jid.setText(account.getJid().toBareJid().toString());
-		TextView statusView = (TextView) view.findViewById(R.id.account_status);
-		ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
-		imageView.setImageBitmap(activity.avatarService().get(account,
-				activity.getPixel(48)));
-        statusView.setText(getContext().getString(account.getStatus().getReadableId()));
-        switch (account.getStatus()) {
-            case ONLINE:
-                statusView.setTextColor(activity.getOnlineColor());
-                break;
-            case DISABLED:
-            case CONNECTING:
-                statusView.setTextColor(activity.getSecondaryTextColor());
-                break;
-            default:
-                statusView.setTextColor(activity.getWarningTextColor());
-                break;
-        }
-		return view;
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
deleted file mode 100644
index b6f88356..00000000
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ /dev/null
@@ -1,237 +0,0 @@
-package eu.siacs.conversations.ui.adapter;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.util.Pair;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-
-import de.tzur.conversations.Settings;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Downloadable;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.Presences;
-import eu.siacs.conversations.ui.ConversationActivity;
-import eu.siacs.conversations.ui.XmppActivity;
-import eu.siacs.conversations.utils.UIHelper;
-import github.ankushsachdeva.emojicon.EmojiconTextView;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.Typeface;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-public class ConversationAdapter extends ArrayAdapter<Conversation> {
-
-	private XmppActivity activity;
-
-	public ConversationAdapter(XmppActivity activity,
-			List<Conversation> conversations) {
-		super(activity, 0, conversations);
-		this.activity = activity;
-	}
-
-	@Override
-	public View getView(int position, View view, ViewGroup parent) {
-		if (view == null) {
-			LayoutInflater inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-			view = inflater.inflate(R.layout.conversation_list_row,parent, false);
-		}
-		Conversation conversation = getItem(position);
-		if (this.activity instanceof ConversationActivity) {
-			ConversationActivity activity = (ConversationActivity) this.activity;
-			if (!activity.isConversationsOverviewHideable()) {
-				if (conversation == activity.getSelectedConversation()) {
-					view.setBackgroundColor(activity
-							.getSecondaryBackgroundColor());
-				} else {
-					view.setBackgroundColor(Color.TRANSPARENT);
-				}
-			} else {
-				view.setBackgroundColor(Color.TRANSPARENT);
-			}
-		}
-		TextView convName = (TextView) view.findViewById(R.id.conversation_name);
-		if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
-			convName.setText(conversation.getName());
-		} else {
-			convName.setText(conversation.getJid().toBareJid().toString());
-		}
-		EmojiconTextView mLastMessage = (EmojiconTextView) view.findViewById(R.id.conversation_lastmsg);
-		TextView mTimestamp = (TextView) view.findViewById(R.id.conversation_lastupdate);
-		ImageView imagePreview = (ImageView) view.findViewById(R.id.conversation_lastimage);
-
-        if (Settings.SHOW_ONLINE_STATUS && conversation != null && conversation.getAccount().getStatus() == Account.State.ONLINE) {
-            TextView status = (TextView) view.findViewById(R.id.status);
-
-            String color = "#000000";
-            if (conversation.getMode() == Conversation.MODE_SINGLE) {
-                switch (conversation.getContact().getMostAvailableStatus()) {
-                    case Presences.ONLINE:
-                    case Presences.CHAT:
-                        color = "#259B23";
-                        break;
-                    case Presences.AWAY:
-                    case Presences.XA:
-                        color = "#FF9800";
-                        break;
-                    case Presences.DND:
-                        color = "#E51C23";
-                        break;
-                }
-            } else if (conversation.getMode() == Conversation.MODE_MULTI && conversation.getMucOptions().online()) {
-                color = "#259B23";
-            }
-            status.setBackgroundColor(Color.parseColor(color));
-        }
-
-		Message message = conversation.getLatestMessage();
-
-		if (!conversation.isRead()) {
-			convName.setTypeface(null, Typeface.BOLD);
-		} else {
-			convName.setTypeface(null, Typeface.NORMAL);
-		}
-
-		if (message.getImageParams().width > 0
-				&& (message.getDownloadable() == null
-				|| message.getDownloadable().getStatus() != Downloadable.STATUS_DELETED)) {
-			mLastMessage.setVisibility(View.GONE);
-			imagePreview.setVisibility(View.VISIBLE);
-			activity.loadBitmap(message, imagePreview);
-		} else {
-			Pair<String,Boolean> preview = UIHelper.getMessagePreview(activity,message);
-			mLastMessage.setVisibility(View.VISIBLE);
-			imagePreview.setVisibility(View.GONE);
-            boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-            CharSequence msgText = parseEmoticons ? UIHelper.transformAsciiEmoticons(getContext(), preview.first) : preview.first;
-			mLastMessage.setText(msgText);
-			if (preview.second) {
-				if (conversation.isRead()) {
-					mLastMessage.setTypeface(null, Typeface.ITALIC);
-				} else {
-					mLastMessage.setTypeface(null,Typeface.BOLD_ITALIC);
-				}
-			} else {
-				if (conversation.isRead()) {
-					mLastMessage.setTypeface(null,Typeface.NORMAL);
-				} else {
-					mLastMessage.setTypeface(null,Typeface.BOLD);
-				}
-			}
-		}
-
-		mTimestamp.setText(UIHelper.readableTimeDifference(activity,conversation.getLatestMessage().getTimeSent()));
-		ImageView profilePicture = (ImageView) view.findViewById(R.id.conversation_image);
-		loadAvatar(conversation,profilePicture);
-
-		return view;
-	}
-
-	class BitmapWorkerTask extends AsyncTask<Conversation, Void, Bitmap> {
-		private final WeakReference<ImageView> imageViewReference;
-		private Conversation conversation = null;
-
-		public BitmapWorkerTask(ImageView imageView) {
-			imageViewReference = new WeakReference<>(imageView);
-		}
-
-		@Override
-		protected Bitmap doInBackground(Conversation... params) {
-			return activity.avatarService().get(params[0], activity.getPixel(56));
-		}
-
-		@Override
-		protected void onPostExecute(Bitmap bitmap) {
-			if (bitmap != null) {
-				final ImageView imageView = imageViewReference.get();
-				if (imageView != null) {
-					imageView.setImageBitmap(bitmap);
-					imageView.setBackgroundColor(0x00000000);
-				}
-			}
-		}
-	}
-
-	public void loadAvatar(Conversation conversation, ImageView imageView) {
-		if (cancelPotentialWork(conversation, imageView)) {
-			final Bitmap bm = activity.avatarService().get(conversation, activity.getPixel(56), true);
-			if (bm != null) {
-				imageView.setImageBitmap(bm);
-				imageView.setBackgroundColor(0x00000000);
-			} else {
-				imageView.setBackgroundColor(UIHelper.getColorForName(conversation.getName()));
-				imageView.setImageDrawable(null);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(conversation);
-				} catch (final RejectedExecutionException ignored) {
-				}
-			}
-		}
-	}
-
-	public static boolean cancelPotentialWork(Conversation conversation, ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final Conversation oldConversation = bitmapWorkerTask.conversation;
-			if (oldConversation == null || conversation != oldConversation) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	static class AsyncDrawable extends BitmapDrawable {
-		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
-
-		public AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
-			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
-		}
-
-		public BitmapWorkerTask getBitmapWorkerTask() {
-			return bitmapWorkerTaskReference.get();
-		}
-	}
-}
\ No newline at end of file
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
deleted file mode 100644
index 0993735f..00000000
--- a/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package eu.siacs.conversations.ui.adapter;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import android.content.Context;
-import android.widget.ArrayAdapter;
-import android.widget.Filter;
-
-public class KnownHostsAdapter extends ArrayAdapter<String> {
-	private ArrayList<String> domains;
-	private Filter domainFilter = new Filter() {
-
-		@Override
-		protected FilterResults performFiltering(CharSequence constraint) {
-			if (constraint != null) {
-				ArrayList<String> suggestions = new ArrayList<String>();
-				final String[] split = constraint.toString().split("@");
-				if (split.length == 1) {
-					for (String domain : domains) {
-						suggestions.add(split[0].toLowerCase(Locale
-								.getDefault()) + "@" + domain);
-					}
-				} else if (split.length == 2) {
-					for (String domain : domains) {
-						if (domain.contentEquals(split[1])) {
-							suggestions.clear();
-							break;
-						} else if (domain.contains(split[1])) {
-							suggestions.add(split[0].toLowerCase(Locale
-									.getDefault()) + "@" + domain);
-						}
-					}
-				} else {
-					return new FilterResults();
-				}
-				FilterResults filterResults = new FilterResults();
-				filterResults.values = suggestions;
-				filterResults.count = suggestions.size();
-				return filterResults;
-			} else {
-				return new FilterResults();
-			}
-		}
-
-		@Override
-		protected void publishResults(CharSequence constraint,
-				FilterResults results) {
-			ArrayList filteredList = (ArrayList) results.values;
-			if (results != null && results.count > 0) {
-				clear();
-				for (Object c : filteredList) {
-					add((String) c);
-				}
-				notifyDataSetChanged();
-			}
-		}
-	};
-
-	public KnownHostsAdapter(Context context, int viewResourceId,
-			List<String> mKnownHosts) {
-		super(context, viewResourceId, new ArrayList<String>());
-		domains = new ArrayList<String>(mKnownHosts);
-	}
-
-	@Override
-	public Filter getFilter() {
-		return domainFilter;
-	}
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
deleted file mode 100644
index 7b20b55f..00000000
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package eu.siacs.conversations.ui.adapter;
-
-import java.lang.ref.WeakReference;
-import java.util.List;
-import java.util.concurrent.RejectedExecutionException;
-
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.ui.XmppActivity;
-import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.jid.Jid;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.preference.PreferenceManager;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-public class ListItemAdapter extends ArrayAdapter<ListItem> {
-
-	protected XmppActivity activity;
-	protected boolean showDynamicTags = false;
-	private View.OnClickListener onTagTvClick = new View.OnClickListener() {
-		@Override
-		public void onClick(View view) {
-			if (view instanceof  TextView && mOnTagClickedListener != null) {
-				TextView tv = (TextView) view;
-				final String tag = tv.getText().toString();
-				mOnTagClickedListener.onTagClicked(tag);
-			}
-		}
-	};
-	private OnTagClickedListener mOnTagClickedListener = null;
-
-	public ListItemAdapter(XmppActivity activity, List<ListItem> objects) {
-		super(activity, 0, objects);
-		this.activity = activity;
-		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-		this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false);
-	}
-
-	@Override
-	public View getView(int position, View view, ViewGroup parent) {
-		LayoutInflater inflater = (LayoutInflater) getContext()
-				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-		ListItem item = getItem(position);
-		if (view == null) {
-			view = inflater.inflate(R.layout.contact, parent, false);
-		}
-		TextView tvName = (TextView) view.findViewById(R.id.contact_display_name);
-		TextView tvJid = (TextView) view.findViewById(R.id.contact_jid);
-		ImageView picture = (ImageView) view.findViewById(R.id.contact_photo);
-		LinearLayout tagLayout = (LinearLayout) view.findViewById(R.id.tags);
-
-		List<ListItem.Tag> tags = item.getTags();
-		if (tags.size() == 0 || !this.showDynamicTags) {
-			tagLayout.setVisibility(View.GONE);
-		} else {
-			tagLayout.setVisibility(View.VISIBLE);
-			tagLayout.removeAllViewsInLayout();
-			for(ListItem.Tag tag : tags) {
-				TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag,tagLayout,false);
-				tv.setText(tag.getName());
-				tv.setBackgroundColor(tag.getColor());
-				tv.setOnClickListener(this.onTagTvClick);
-				tagLayout.addView(tv);
-			}
-		}
-		final Jid jid = item.getJid();
-		if (jid != null) {
-			tvJid.setText(jid.toString());
-		} else {
-			tvJid.setText("");
-		}
-		tvName.setText(item.getDisplayName());
-		loadAvatar(item,picture);
-		return view;
-	}
-
-	public void setOnTagClickedListener(OnTagClickedListener listener) {
-		this.mOnTagClickedListener = listener;
-	}
-
-	public interface OnTagClickedListener {
-		public void onTagClicked(String tag);
-	}
-
-	class BitmapWorkerTask extends AsyncTask<ListItem, Void, Bitmap> {
-		private final WeakReference<ImageView> imageViewReference;
-		private ListItem item = null;
-
-		public BitmapWorkerTask(ImageView imageView) {
-			imageViewReference = new WeakReference<>(imageView);
-		}
-
-		@Override
-		protected Bitmap doInBackground(ListItem... params) {
-			return activity.avatarService().get(params[0], activity.getPixel(48));
-		}
-
-		@Override
-		protected void onPostExecute(Bitmap bitmap) {
-			if (bitmap != null) {
-				final ImageView imageView = imageViewReference.get();
-				if (imageView != null) {
-					imageView.setImageBitmap(bitmap);
-					imageView.setBackgroundColor(0x00000000);
-				}
-			}
-		}
-	}
-
-	public void loadAvatar(ListItem item, ImageView imageView) {
-		if (cancelPotentialWork(item, imageView)) {
-			final Bitmap bm = activity.avatarService().get(item,activity.getPixel(48),true);
-			if (bm != null) {
-				imageView.setImageBitmap(bm);
-				imageView.setBackgroundColor(0x00000000);
-			} else {
-				imageView.setBackgroundColor(UIHelper.getColorForName(item.getDisplayName()));
-				imageView.setImageDrawable(null);
-				final BitmapWorkerTask task = new BitmapWorkerTask(imageView);
-				final AsyncDrawable asyncDrawable = new AsyncDrawable(activity.getResources(), null, task);
-				imageView.setImageDrawable(asyncDrawable);
-				try {
-					task.execute(item);
-				} catch (final RejectedExecutionException ignored) {
-				}
-			}
-		}
-	}
-
-	public static boolean cancelPotentialWork(ListItem item, ImageView imageView) {
-		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
-
-		if (bitmapWorkerTask != null) {
-			final ListItem oldItem = bitmapWorkerTask.item;
-			if (oldItem == null || item != oldItem) {
-				bitmapWorkerTask.cancel(true);
-			} else {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private static BitmapWorkerTask getBitmapWorkerTask(ImageView imageView) {
-		if (imageView != null) {
-			final Drawable drawable = imageView.getDrawable();
-			if (drawable instanceof AsyncDrawable) {
-				final AsyncDrawable asyncDrawable = (AsyncDrawable) drawable;
-				return asyncDrawable.getBitmapWorkerTask();
-			}
-		}
-		return null;
-	}
-
-	static class AsyncDrawable extends BitmapDrawable {
-		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
-
-		public AsyncDrawable(Resources res, Bitmap bitmap, BitmapWorkerTask bitmapWorkerTask) {
-			super(res, bitmap);
-			bitmapWorkerTaskReference = new WeakReference<>(bitmapWorkerTask);
-		}
-
-		public BitmapWorkerTask getBitmapWorkerTask() {
-			return bitmapWorkerTaskReference.get();
-		}
-	}
-
-}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
deleted file mode 100644
index 933ca1f8..00000000
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ /dev/null
@@ -1,604 +0,0 @@
-package eu.siacs.conversations.ui.adapter;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.graphics.Typeface;
-import android.net.Uri;
-import android.preference.PreferenceManager;
-import android.text.Spannable;
-import android.text.SpannableString;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.StyleSpan;
-import android.util.DisplayMetrics;
-import android.util.Log;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import java.util.List;
-
-import de.tzur.conversations.Settings;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Downloadable;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.Message.ImageParams;
-import eu.siacs.conversations.ui.ConversationActivity;
-import eu.siacs.conversations.utils.GeoHelper;
-import eu.siacs.conversations.utils.UIHelper;
-import github.ankushsachdeva.emojicon.EmojiconTextView;
-
-public class MessageAdapter extends ArrayAdapter<Message> {
-
-	private static final int SENT = 0;
-	private static final int RECEIVED = 1;
-	private static final int STATUS = 2;
-	private static final int NULL = 3;
-
-	private ConversationActivity activity;
-
-	private DisplayMetrics metrics;
-
-	private OnContactPictureClicked mOnContactPictureClickedListener;
-	private OnContactPictureLongClicked mOnContactPictureLongClickedListener;
-
-	private OnLongClickListener openContextMenu = new OnLongClickListener() {
-
-		@Override
-		public boolean onLongClick(View v) {
-			v.showContextMenu();
-			return true;
-		}
-	};
-
-	public MessageAdapter(ConversationActivity activity, List<Message> messages) {
-		super(activity, 0, messages);
-		this.activity = activity;
-		metrics = getContext().getResources().getDisplayMetrics();
-	}
-
-	public void setOnContactPictureClicked(OnContactPictureClicked listener) {
-		this.mOnContactPictureClickedListener = listener;
-	}
-
-	public void setOnContactPictureLongClicked(
-			OnContactPictureLongClicked listener) {
-		this.mOnContactPictureLongClickedListener = listener;
-			}
-
-	@Override
-	public int getViewTypeCount() {
-		return 4;
-	}
-
-	@Override
-	public int getItemViewType(int position) {
-		if (getItem(position).wasMergedIntoPrevious()) {
-			return NULL;
-		} else if (getItem(position).getType() == Message.TYPE_STATUS) {
-			return STATUS;
-		} else if (getItem(position).getStatus() <= Message.STATUS_RECEIVED) {
-			return RECEIVED;
-		} else {
-			return SENT;
-		}
-	}
-
-	private void displayStatus(ViewHolder viewHolder, Message message) {
-		String filesize = null;
-		String info = null;
-		boolean error = false;
-		if (viewHolder.indicatorReceived != null) {
-			viewHolder.indicatorReceived.setVisibility(View.GONE);
-		}
-		boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI
-			&& message.getMergedStatus() <= Message.STATUS_RECEIVED;
-		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getDownloadable() != null) {
-			ImageParams params = message.getImageParams();
-			if (params.size > (1.5 * 1024 * 1024)) {
-				filesize = params.size / (1024 * 1024)+ " MiB";
-			} else if (params.size > 0) {
-				filesize = params.size / 1024 + " KiB";
-			}
-			if (message.getDownloadable() != null && message.getDownloadable().getStatus() == Downloadable.STATUS_FAILED) {
-				error = true;
-			}
-		}
-		switch (message.getMergedStatus()) {
-			case Message.STATUS_WAITING:
-				info = getContext().getString(R.string.waiting);
-				break;
-			case Message.STATUS_UNSEND:
-				Downloadable d = message.getDownloadable();
-				if (d!=null) {
-					info = getContext().getString(R.string.sending_file,d.getProgress());
-				} else {
-					info = getContext().getString(R.string.sending);
-				}
-				break;
-			case Message.STATUS_OFFERED:
-				info = getContext().getString(R.string.offering);
-				break;
-			case Message.STATUS_SEND_RECEIVED:
-				if (activity.indicateReceived()) {
-					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
-				}
-				break;
-			case Message.STATUS_SEND_DISPLAYED:
-				if (activity.indicateReceived()) {
-					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
-				}
-				break;
-			case Message.STATUS_SEND_FAILED:
-				info = getContext().getString(R.string.send_failed);
-				error = true;
-				break;
-			default:
-				if (multiReceived) {
-					info = UIHelper.getMessageDisplayName(message);
-				}
-				break;
-		}
-		if (error) {
-			viewHolder.time.setTextColor(activity.getWarningTextColor());
-		} else {
-			viewHolder.time.setTextColor(activity.getSecondaryTextColor());
-		}
-		if (message.getEncryption() == Message.ENCRYPTION_NONE) {
-			viewHolder.indicator.setVisibility(View.GONE);
-		} else {
-			viewHolder.indicator.setVisibility(View.VISIBLE);
-		}
-
-		String formatedTime = UIHelper.readableTimeDifferenceFull(getContext(),
-				message.getMergedTimeSent());
-		if (message.getStatus() <= Message.STATUS_RECEIVED) {
-			if ((filesize != null) && (info != null)) {
-				viewHolder.time.setText(filesize + " \u00B7 " + info);
-			} else if ((filesize == null) && (info != null)) {
-				viewHolder.time.setText(formatedTime + " \u00B7 " + info);
-			} else if ((filesize != null) && (info == null)) {
-				viewHolder.time.setText(formatedTime + " \u00B7 " + filesize);
-			} else {
-				viewHolder.time.setText(formatedTime);
-			}
-		} else {
-			if ((filesize != null) && (info != null)) {
-				viewHolder.time.setText(filesize + " \u00B7 " + info);
-			} else if ((filesize == null) && (info != null)) {
-				if (error) {
-					viewHolder.time.setText(info + " \u00B7 " + formatedTime);
-				} else {
-					viewHolder.time.setText(info);
-				}
-			} else if ((filesize != null) && (info == null)) {
-				viewHolder.time.setText(filesize + " \u00B7 " + formatedTime);
-			} else {
-				viewHolder.time.setText(formatedTime);
-			}
-		}
-	}
-
-	private void displayInfoMessage(ViewHolder viewHolder, String text) {
-		if (viewHolder.download_button != null) {
-			viewHolder.download_button.setVisibility(View.GONE);
-		}
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.VISIBLE);
-		viewHolder.messageBody.setText(text);
-		viewHolder.messageBody.setTextColor(activity.getSecondaryTextColor());
-		viewHolder.messageBody.setTypeface(null, Typeface.ITALIC);
-		viewHolder.messageBody.setTextIsSelectable(false);
-	}
-
-	private void displayDecryptionFailed(ViewHolder viewHolder) {
-		if (viewHolder.download_button != null) {
-			viewHolder.download_button.setVisibility(View.GONE);
-		}
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.VISIBLE);
-		viewHolder.messageBody.setText(getContext().getString(
-					R.string.decryption_failed));
-		viewHolder.messageBody.setTextColor(activity.getWarningTextColor());
-		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
-		viewHolder.messageBody.setTextIsSelectable(false);
-	}
-
-	private void displayTextMessage(final ViewHolder viewHolder, final Message message) {
-		if (viewHolder.download_button != null) {
-			viewHolder.download_button.setVisibility(View.GONE);
-		}
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.VISIBLE);
-		if (message.getBody() != null) {
-			final String nick = UIHelper.getMessageDisplayName(message);
-			final String formattedBody = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND,
-					nick + " ");
-			if (message.getType() != Message.TYPE_PRIVATE) {
-
-				if (message.hasMeCommand()) {
-					final Spannable span = new SpannableString(formattedBody);
-					span.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), 0, nick.length(),
-							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-					viewHolder.messageBody.setText(span);
-				} else {
-                    boolean parseEmoticons = Settings.PARSE_EMOTICONS;
-                    viewHolder.messageBody.setText(parseEmoticons ? UIHelper
-                            .transformAsciiEmoticons(getContext(), message.getMergedBody())
-                            : message.getMergedBody());
-				}
-			} else {
-				String privateMarker;
-				if (message.getStatus() <= Message.STATUS_RECEIVED) {
-					privateMarker = activity
-						.getString(R.string.private_message);
-				} else {
-					final String to;
-					if (message.getCounterpart() != null) {
-						to = message.getCounterpart().getResourcepart();
-					} else {
-						to = "";
-					}
-					privateMarker = activity.getString(R.string.private_message_to, to);
-				}
-				final Spannable span = new SpannableString(privateMarker + " "
-						+ formattedBody);
-				span.setSpan(new ForegroundColorSpan(activity
-							.getSecondaryTextColor()), 0, privateMarker
-						.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				span.setSpan(new StyleSpan(Typeface.BOLD), 0,
-						privateMarker.length(),
-						Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				if (message.hasMeCommand()) {
-					span.setSpan(new StyleSpan(Typeface.BOLD_ITALIC), privateMarker.length() + 1,
-							privateMarker.length() + 1 + nick.length(),
-							Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-				}
-				viewHolder.messageBody.setText(span);
-			}
-		} else {
-			viewHolder.messageBody.setText("");
-		}
-		viewHolder.messageBody.setTextColor(activity.getPrimaryTextColor());
-		viewHolder.messageBody.setTypeface(null, Typeface.NORMAL);
-		viewHolder.messageBody.setTextIsSelectable(true);
-	}
-
-	private void displayDownloadableMessage(ViewHolder viewHolder,
-			final Message message, String text) {
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.GONE);
-		viewHolder.download_button.setVisibility(View.VISIBLE);
-		viewHolder.download_button.setText(text);
-		viewHolder.download_button.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				startDownloadable(message);
-			}
-		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
-	}
-
-	private void displayOpenableMessage(ViewHolder viewHolder,final Message message) {
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.GONE);
-		viewHolder.download_button.setVisibility(View.VISIBLE);
-		viewHolder.download_button.setText(activity.getString(R.string.open_x_file, UIHelper.getFileDescriptionString(activity,message)));
-		viewHolder.download_button.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				openDownloadable(message);
-			}
-		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
-	}
-
-	private void displayLocationMessage(ViewHolder viewHolder, final Message message) {
-		viewHolder.image.setVisibility(View.GONE);
-		viewHolder.messageBody.setVisibility(View.GONE);
-		viewHolder.download_button.setVisibility(View.VISIBLE);
-		viewHolder.download_button.setText(R.string.show_location);
-		viewHolder.download_button.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				showLocation(message);
-			}
-		});
-		viewHolder.download_button.setOnLongClickListener(openContextMenu);
-	}
-
-	private void displayImageMessage(ViewHolder viewHolder,
-			final Message message) {
-		if (viewHolder.download_button != null) {
-			viewHolder.download_button.setVisibility(View.GONE);
-		}
-		viewHolder.messageBody.setVisibility(View.GONE);
-		viewHolder.image.setVisibility(View.VISIBLE);
-		ImageParams params = message.getImageParams();
-		double target = metrics.density * 288;
-		int scalledW;
-		int scalledH;
-		if (params.width <= params.height) {
-			scalledW = (int) (params.width / ((double) params.height / target));
-			scalledH = (int) target;
-		} else {
-			scalledW = (int) target;
-			scalledH = (int) (params.height / ((double) params.width / target));
-		}
-		viewHolder.image.setLayoutParams(new LinearLayout.LayoutParams(
-					scalledW, scalledH));
-		activity.loadBitmap(message, viewHolder.image);
-		viewHolder.image.setOnClickListener(new OnClickListener() {
-
-			@Override
-			public void onClick(View v) {
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-				intent.setDataAndType(activity.xmppConnectionService
-						.getFileBackend().getJingleFileUri(message), "image/*");
-				getContext().startActivity(intent);
-			}
-		});
-		viewHolder.image.setOnLongClickListener(openContextMenu);
-	}
-
-	@Override
-	public View getView(int position, View view, ViewGroup parent) {
-		final Message message = getItem(position);
-		final Conversation conversation = message.getConversation();
-		final Account account = conversation.getAccount();
-		final int type = getItemViewType(position);
-		ViewHolder viewHolder;
-		if (view == null) {
-			viewHolder = new ViewHolder();
-			switch (type) {
-				case NULL:
-					view = activity.getLayoutInflater().inflate(
-							R.layout.message_null, parent, false);
-					break;
-				case SENT:
-					view = activity.getLayoutInflater().inflate(
-							R.layout.message_sent, parent, false);
-					viewHolder.message_box = (LinearLayout) view
-						.findViewById(R.id.message_box);
-					viewHolder.contact_picture = (ImageView) view
-						.findViewById(R.id.message_photo);
-					viewHolder.download_button = (Button) view
-						.findViewById(R.id.download_button);
-					viewHolder.indicator = (ImageView) view
-						.findViewById(R.id.security_indicator);
-					viewHolder.image = (ImageView) view
-						.findViewById(R.id.message_image);
-					viewHolder.messageBody = (EmojiconTextView) view
-						.findViewById(R.id.message_body);
-					viewHolder.time = (TextView) view
-						.findViewById(R.id.message_time);
-					viewHolder.indicatorReceived = (ImageView) view
-						.findViewById(R.id.indicator_received);
-					break;
-				case RECEIVED:
-					view = activity.getLayoutInflater().inflate(
-							R.layout.message_received, parent, false);
-					viewHolder.message_box = (LinearLayout) view
-						.findViewById(R.id.message_box);
-					viewHolder.contact_picture = (ImageView) view
-						.findViewById(R.id.message_photo);
-					viewHolder.download_button = (Button) view
-						.findViewById(R.id.download_button);
-					viewHolder.indicator = (ImageView) view
-						.findViewById(R.id.security_indicator);
-					viewHolder.image = (ImageView) view
-						.findViewById(R.id.message_image);
-					viewHolder.messageBody = (EmojiconTextView) view
-						.findViewById(R.id.message_body);
-					viewHolder.time = (TextView) view
-						.findViewById(R.id.message_time);
-					viewHolder.indicatorReceived = (ImageView) view
-						.findViewById(R.id.indicator_received);
-					break;
-				case STATUS:
-					view = activity.getLayoutInflater().inflate(R.layout.message_status, parent, false);
-					viewHolder.contact_picture = (ImageView) view.findViewById(R.id.message_photo);
-					viewHolder.status_message = (TextView) view.findViewById(R.id.status_message);
-					break;
-				default:
-					viewHolder = null;
-					break;
-			}
-			view.setTag(viewHolder);
-		} else {
-			viewHolder = (ViewHolder) view.getTag();
-			if (viewHolder == null) {
-				return view;
-			}
-		}
-
-		if (type == STATUS) {
-			if (conversation.getMode() == Conversation.MODE_SINGLE) {
-				viewHolder.contact_picture.setImageBitmap(activity
-						.avatarService().get(conversation.getContact(),
-							activity.getPixel(32)));
-				viewHolder.contact_picture.setAlpha(0.5f);
-				viewHolder.status_message.setText(message.getBody());
-			}
-			return view;
-		} else if (type == NULL) {
-			if (viewHolder.message_box != null) {
-				Log.e(Config.LOGTAG, "detected type=NULL but with wrong cached view");
-				view = activity.getLayoutInflater().inflate(R.layout.message_null, parent, false);
-				view.setTag(new ViewHolder());
-			}
-			if (position == getCount() - 1) {
-				view.getLayoutParams().height = 1;
-			} else {
-				view.getLayoutParams().height = 0;
-
-			}
-			view.setLayoutParams(view.getLayoutParams());
-			return view;
-		} else if (message.wasMergedIntoPrevious()) {
-			Log.e(Config.LOGTAG,"detected wasMergedIntoPrevious with wrong type");
-			return view;
-		} else if (viewHolder.messageBody == null || viewHolder.image == null) {
-			return view; //avoiding weird platform bugs
-		} else if (type == RECEIVED) {
-			Contact contact = message.getContact();
-			if (contact != null) {
-				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(contact, activity.getPixel(48)));
-			} else if (conversation.getMode() == Conversation.MODE_MULTI) {
-				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(
-						UIHelper.getMessageDisplayName(message),
-						activity.getPixel(48)));
-			}
-		} else if (type == SENT) {
-			viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(account, activity.getPixel(48)));
-		}
-
-		viewHolder.contact_picture
-			.setOnClickListener(new OnClickListener() {
-
-				@Override
-				public void onClick(View v) {
-					if (MessageAdapter.this.mOnContactPictureClickedListener != null) {
-						MessageAdapter.this.mOnContactPictureClickedListener
-							.onContactPictureClicked(message);
-					}
-
-				}
-			});
-		viewHolder.contact_picture
-			.setOnLongClickListener(new OnLongClickListener() {
-
-				@Override
-				public boolean onLongClick(View v) {
-					if (MessageAdapter.this.mOnContactPictureLongClickedListener != null) {
-						MessageAdapter.this.mOnContactPictureLongClickedListener
-							.onContactPictureLongClicked(message);
-						return true;
-					} else {
-						return false;
-					}
-				}
-			});
-
-		final Downloadable downloadable = message.getDownloadable();
-		if (downloadable != null && downloadable.getStatus() != Downloadable.STATUS_UPLOADING) {
-			if (downloadable.getStatus() == Downloadable.STATUS_OFFER) {
-				displayDownloadableMessage(viewHolder,message,activity.getString(R.string.download_x_file, UIHelper.getFileDescriptionString(activity, message)));
-			} else if (downloadable.getStatus() == Downloadable.STATUS_OFFER_CHECK_FILESIZE) {
-				displayDownloadableMessage(viewHolder, message, activity.getString(R.string.check_image_filesize));
-			} else {
-				displayInfoMessage(viewHolder, UIHelper.getMessagePreview(activity, message).first);
-			}
-		} else if (message.getType() == Message.TYPE_IMAGE && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) {
-			displayImageMessage(viewHolder, message);
-		} else if (message.getType() == Message.TYPE_FILE && message.getEncryption() != Message.ENCRYPTION_PGP && message.getEncryption() != Message.ENCRYPTION_DECRYPTION_FAILED) {
-			if (message.getImageParams().width > 0) {
-				displayImageMessage(viewHolder,message);
-			} else {
-				displayOpenableMessage(viewHolder, message);
-			}
-		} else if (message.getEncryption() == Message.ENCRYPTION_PGP) {
-			if (activity.hasPgp()) {
-				displayInfoMessage(viewHolder,activity.getString(R.string.encrypted_message));
-			} else {
-				displayInfoMessage(viewHolder,
-						activity.getString(R.string.install_openkeychain));
-				if (viewHolder != null) {
-					viewHolder.message_box
-						.setOnClickListener(new OnClickListener() {
-
-							@Override
-							public void onClick(View v) {
-								activity.showInstallPgpDialog();
-							}
-						});
-				}
-			}
-		} else if (message.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
-			displayDecryptionFailed(viewHolder);
-		} else {
-			if (GeoHelper.isGeoUri(message.getBody())) {
-				displayLocationMessage(viewHolder,message);
-			} else {
-				displayTextMessage(viewHolder, message);
-			}
-		}
-
-		displayStatus(viewHolder, message);
-
-		return view;
-	}
-
-	public void startDownloadable(Message message) {
-		Downloadable downloadable = message.getDownloadable();
-		if (downloadable != null) {
-			if (!downloadable.start()) {
-				Toast.makeText(activity, R.string.not_connected_try_again,
-						Toast.LENGTH_SHORT).show();
-			}
-		}
-	}
-
-	public void openDownloadable(Message message) {
-		DownloadableFile file = activity.xmppConnectionService.getFileBackend().getFile(message);
-		if (!file.exists()) {
-			Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
-			return;
-		}
-		Intent openIntent = new Intent(Intent.ACTION_VIEW);
-		openIntent.setDataAndType(Uri.fromFile(file), file.getMimeType());
-		PackageManager manager = activity.getPackageManager();
-		List<ResolveInfo> infos = manager.queryIntentActivities(openIntent, 0);
-		if (infos.size() > 0) {
-			getContext().startActivity(openIntent);
-		} else {
-			Toast.makeText(activity,R.string.no_application_found_to_open_file,Toast.LENGTH_SHORT).show();
-		}
-	}
-
-	public void showLocation(Message message) {
-		for(Intent intent : GeoHelper.createGeoIntentsFromMessage(message)) {
-			if (intent.resolveActivity(getContext().getPackageManager()) != null) {
-				getContext().startActivity(intent);
-				return;
-			}
-		}
-		Toast.makeText(activity,R.string.no_application_found_to_display_location,Toast.LENGTH_SHORT).show();
-	}
-
-	public interface OnContactPictureClicked {
-		public void onContactPictureClicked(Message message);
-	}
-
-	public interface OnContactPictureLongClicked {
-		public void onContactPictureLongClicked(Message message);
-	}
-
-	private static class ViewHolder {
-
-		protected LinearLayout message_box;
-		protected Button download_button;
-		protected ImageView image;
-		protected ImageView indicator;
-		protected ImageView indicatorReceived;
-		protected TextView time;
-		protected EmojiconTextView messageBody;
-		protected ImageView contact_picture;
-		protected TextView status_message;
-	}
-}