Merge branch 'master' of ssh://git.fucktheforce.de/conversations

Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
author: lookshe <github@lookshe.org> 2015-01-03 23:19:05 +0100
committer: lookshe <github@lookshe.org> 2015-01-03 23:19:05 +0100
commit: 95e2a539517c27b3235acd582f17968c8e301e81 (patch)
tree: 213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/java/eu/siacs/conversations/ui
parent: 48717dd7d37c066ab626fc626a2ced626ef21d42 (diff)
parent: 4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff)
19 files changed, 1762 insertions, 949 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java
new file mode 100644
index 00000000..1a9fc95c
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/AbstractSearchableListItemActivity.java
@@ -0,0 +1,124 @@
+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
new file mode 100644
index 00000000..9cf7e9f8
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/BlockContactDialog.java
@@ -0,0 +1,41 @@
+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
new file mode 100644
index 00000000..13d7f4fc
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/BlocklistActivity.java
@@ -0,0 +1,75 @@
+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
new file mode 100644
index 00000000..54c064c6
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java
@@ -0,0 +1,107 @@
+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.trim().isEmpty()) {
+					mNewPassword.requestFocus();
+					mNewPassword.setError(getString(R.string.password_should_not_be_empty));
+				} 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
index e7254933..70b353c6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
@@ -1,101 +1,33 @@
 package eu.siacs.conversations.ui;
 
-import java.util.ArrayList;
-import java.util.Collections;
-
 import android.content.Context;
 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.inputmethod.InputMethodManager;
 import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.EditText;
-import android.widget.ListView;
-import eu.siacs.conversations.R;
+
+import java.util.Collections;
+
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.ui.adapter.ListItemAdapter;
-
-public class ChooseContactActivity extends XmppActivity {
-
-	private ListView mListView;
-	private ArrayList<ListItem> contacts = new ArrayList<>();
-	private ArrayAdapter<ListItem> mContactsAdapter;
-
-	private EditText mSearchEditText;
-
-	private TextWatcher mSearchTextWatcher = new TextWatcher() {
-
-		@Override
-		public void afterTextChanged(Editable editable) {
-			filterContacts(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.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("");
-			filterContacts(null);
-			return true;
-		}
-	};
 
+public class ChooseContactActivity extends AbstractSearchableListItemActivity {
 	@Override
-	public void onCreate(Bundle savedInstanceState) {
+	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);
-		mContactsAdapter = new ListItemAdapter(this, contacts);
-		mListView.setAdapter(mContactsAdapter);
-		mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+		getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
 			@Override
-			public void onItemClick(AdapterView<?> arg0, View arg1,
-					int position, long arg3) {
-				InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-				imm.hideSoftInputFromWindow(mSearchEditText.getWindowToken(),
+			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);
-				Intent request = getIntent();
-				Intent data = new Intent();
-				ListItem mListItem = contacts.get(position);
+				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) {
@@ -108,38 +40,21 @@ public class ChooseContactActivity extends XmppActivity {
 				finish();
 			}
 		});
-	}
 
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		getMenuInflater().inflate(R.menu.choose_contact, menu);
-		MenuItem menuSearchView = menu.findItem(R.id.action_search);
-		View mSearchView = menuSearchView.getActionView();
-		mSearchEditText = (EditText) mSearchView
-				.findViewById(R.id.search_field);
-		mSearchEditText.addTextChangedListener(mSearchTextWatcher);
-		menuSearchView.setOnActionExpandListener(mOnActionExpandListener);
-		return true;
 	}
 
-	@Override
-	void onBackendConnected() {
-		filterContacts(null);
-	}
-
-	protected void filterContacts(String needle) {
-		this.contacts.clear();
-		for (Account account : xmppConnectionService.getAccounts()) {
+	protected void filterContacts(final String needle) {
+		getListItems().clear();
+		for (final Account account : xmppConnectionService.getAccounts()) {
 			if (account.getStatus() != Account.State.DISABLED) {
-				for (Contact contact : account.getRoster().getContacts()) {
+				for (final Contact contact : account.getRoster().getContacts()) {
 					if (contact.showInRoster() && contact.match(needle)) {
-						this.contacts.add(contact);
+						getListItems().add(contact);
 					}
 				}
 			}
 		}
-		Collections.sort(this.contacts);
-		mContactsAdapter.notifyDataSetChanged();
+		Collections.sort(getListItems());
+		getListItemAdapter().notifyDataSetChanged();
 	}
-
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 2e36c545..eeb015f3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -157,8 +157,8 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 						@Override
 						public void onValueEdited(String value) {
 							MessagePacket packet = xmppConnectionService
-									.getMessageGenerator().conferenceSubject(
-											mConversation, value);
+								.getMessageGenerator().conferenceSubject(
+										mConversation, value);
 							xmppConnectionService.sendMessagePacket(
 									mConversation.getAccount(), packet);
 						}
@@ -191,7 +191,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	@Override
 	protected String getShareableUri() {
 		if (mConversation != null) {
-			return "xmpp:" + mConversation.getContactJid().toBareJid().toString() + "?join";
+			return "xmpp:" + mConversation.getJid().toBareJid().toString() + "?join";
 		} else {
 			return "";
 		}
@@ -202,7 +202,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		MenuItem menuItemSaveBookmark = menu.findItem(R.id.action_save_as_bookmark);
 		MenuItem menuItemDeleteBookmark = menu.findItem(R.id.action_delete_bookmark);
 		Account account = mConversation.getAccount();
-		if (account.hasBookmarkFor(mConversation.getContactJid().toBareJid())) {
+		if (account.hasBookmarkFor(mConversation.getJid().toBareJid())) {
 			menuItemSaveBookmark.setVisible(false);
 			menuItemDeleteBookmark.setVisible(true);
 		} else {
@@ -263,9 +263,9 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 	protected void saveAsBookmark() {
 		Account account = mConversation.getAccount();
-		Bookmark bookmark = new Bookmark(account, mConversation.getContactJid().toBareJid());
-		if (!mConversation.getContactJid().isBareJid()) {
-			bookmark.setNick(mConversation.getContactJid().getResourcepart());
+		Bookmark bookmark = new Bookmark(account, mConversation.getJid().toBareJid());
+		if (!mConversation.getJid().isBareJid()) {
+			bookmark.setNick(mConversation.getJid().getResourcepart());
 		}
 		bookmark.setAutojoin(true);
 		account.getBookmarks().add(bookmark);
@@ -288,7 +288,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 		}
 		if (uuid != null) {
 			this.mConversation = xmppConnectionService
-					.findConversationByUuid(uuid);
+				.findConversationByUuid(uuid);
 			if (this.mConversation != null) {
 				populateView();
 			}
@@ -297,11 +297,11 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 
 	private void populateView() {
 		mAccountJid.setText(getString(R.string.using_account, mConversation
-				.getAccount().getJid().toBareJid()));
+					.getAccount().getJid().toBareJid()));
 		mYourPhoto.setImageBitmap(avatarService().get(
-				mConversation.getAccount(), getPixel(48)));
+					mConversation.getAccount(), getPixel(48)));
 		setTitle(mConversation.getName());
-		mFullJid.setText(mConversation.getContactJid().toBareJid().toString());
+		mFullJid.setText(mConversation.getJid().toBareJid().toString());
 		mYourNick.setText(mConversation.getMucOptions().getActualNick());
 		mRoleAffiliaton = (TextView) findViewById(R.id.muc_role);
 		if (mConversation.getMucOptions().online()) {
@@ -338,7 +338,7 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 			registerForContextMenu(view);
 			view.setTag(user);
 			TextView name = (TextView) view
-					.findViewById(R.id.contact_display_name);
+				.findViewById(R.id.contact_display_name);
 			TextView key = (TextView) view.findViewById(R.id.key);
 			TextView role = (TextView) view.findViewById(R.id.contact_jid);
 			if (user.getPgpKeyId() != 0) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 4259371a..657ae75b 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -37,11 +37,13 @@ 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.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
 
-public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate {
+public class ContactDetailsActivity extends XmppActivity implements OnAccountUpdate, OnRosterUpdate, OnUpdateBlocklist {
 	public static final String ACTION_VIEW_CONTACT = "view_contact";
 
 	private Contact contact;
@@ -50,7 +52,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		@Override
 		public void onClick(DialogInterface dialog, int which) {
 			ContactDetailsActivity.this.xmppConnectionService
-					.deleteContactOnServer(contact);
+				.deleteContactOnServer(contact);
 			ContactDetailsActivity.this.finish();
 		}
 	};
@@ -58,14 +60,14 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 		@Override
 		public void onCheckedChanged(CompoundButton buttonView,
-									 boolean isChecked) {
+				boolean isChecked) {
 			if (isChecked) {
 				if (contact
 						.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)) {
 					xmppConnectionService.sendPresencePacket(contact
-									.getAccount(),
+							.getAccount(),
 							xmppConnectionService.getPresenceGenerator()
-									.sendPresenceUpdatesTo(contact));
+							.sendPresenceUpdatesTo(contact));
 				} else {
 					contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
 				}
@@ -73,7 +75,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 				contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
 				xmppConnectionService.sendPresencePacket(contact.getAccount(),
 						xmppConnectionService.getPresenceGenerator()
-								.stopPresenceUpdatesTo(contact));
+						.stopPresenceUpdatesTo(contact));
 			}
 		}
 	};
@@ -81,15 +83,15 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 
 		@Override
 		public void onCheckedChanged(CompoundButton buttonView,
-									 boolean isChecked) {
+				boolean isChecked) {
 			if (isChecked) {
 				xmppConnectionService.sendPresencePacket(contact.getAccount(),
 						xmppConnectionService.getPresenceGenerator()
-								.requestPresenceUpdatesFrom(contact));
+						.requestPresenceUpdatesFrom(contact));
 			} else {
 				xmppConnectionService.sendPresencePacket(contact.getAccount(),
 						xmppConnectionService.getPresenceGenerator()
-								.stopPresenceUpdatesFrom(contact));
+						.stopPresenceUpdatesFrom(contact));
 			}
 		}
 	};
@@ -127,7 +129,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 					ContactDetailsActivity.this);
 			builder.setTitle(getString(R.string.action_add_phone_book));
 			builder.setMessage(getString(R.string.add_phone_book_text,
-					contact.getJid()));
+						contact.getJid()));
 			builder.setNegativeButton(getString(R.string.cancel), null);
 			builder.setPositiveButton(getString(R.string.add), addToPhonebook);
 			builder.create().show();
@@ -166,7 +168,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 	}
 
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		if (getIntent().getAction().equals(ACTION_VIEW_CONTACT)) {
 			try {
@@ -188,15 +190,17 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		badge = (QuickContactBadge) findViewById(R.id.details_contact_badge);
 		keys = (LinearLayout) findViewById(R.id.details_contact_keys);
 		tags = (LinearLayout) findViewById(R.id.tags);
-		getActionBar().setHomeButtonEnabled(true);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
+		if (getActionBar() != null) {
+			getActionBar().setHomeButtonEnabled(true);
+			getActionBar().setDisplayHomeAsUpEnabled(true);
+		}
 
-		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
 		this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false);
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem menuItem) {
+	public boolean onOptionsItemSelected(final MenuItem menuItem) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		switch (menuItem.getItemId()) {
@@ -205,11 +209,11 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 				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();
+					.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) {
@@ -219,7 +223,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 						public void onValueEdited(String value) {
 							contact.setServerName(value);
 							ContactDetailsActivity.this.xmppConnectionService
-									.pushContactToServer(contact);
+								.pushContactToServer(contact);
 							populateView();
 						}
 					});
@@ -285,7 +289,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		receive.setOnCheckedChangeListener(this.mOnReceiveCheckedChange);
 
 		lastseen.setText(UIHelper.lastseen(getApplicationContext(),
-				contact.lastseen.time));
+					contact.lastseen.time));
 
 		if (contact.getPresences().size() > 1) {
 			contactJidTv.setText(contact.getJid() + " ("
@@ -294,7 +298,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 			contactJidTv.setText(contact.getJid().toString());
 		}
 		accountJidTv.setText(getString(R.string.using_account, contact
-				.getAccount().getJid().toBareJid()));
+					.getAccount().getJid().toBareJid()));
 		prepareContactBadge(badge, contact);
 		if (contact.getSystemAccount() == null) {
 			badge.setOnClickListener(onBadgeClick);
@@ -309,10 +313,10 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 			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);
+				.findViewById(R.id.button_remove);
 			remove.setVisibility(View.VISIBLE);
 			keyType.setText("OTR Fingerprint");
-			key.setText(otrFingerprint);
+			key.setText(CryptoHelper.prettifyFingerprint(otrFingerprint));
 			keys.addView(view);
 			remove.setOnClickListener(new OnClickListener() {
 
@@ -334,7 +338,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 				@Override
 				public void onClick(View v) {
 					PgpEngine pgp = ContactDetailsActivity.this.xmppConnectionService
-							.getPgpEngine();
+						.getPgpEngine();
 					if (pgp != null) {
 						PendingIntent intent = pgp.getIntentForKey(contact);
 						if (intent != null) {
@@ -363,8 +367,8 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		} else {
 			tags.setVisibility(View.VISIBLE);
 			tags.removeAllViewsInLayout();
-			for(ListItem.Tag tag : tagList) {
-				TextView tv = (TextView) inflater.inflate(R.layout.list_item_tag,tags,false);
+			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);
@@ -393,8 +397,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 					public void onClick(DialogInterface dialog, int which) {
 						if (contact.deleteOtrFingerprint(fingerprint)) {
 							populateView();
-							xmppConnectionService.syncRosterToDisk(contact
-									.getAccount());
+							xmppConnectionService.syncRosterToDisk(contact.getAccount());
 						}
 					}
 
@@ -406,7 +409,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 	public void onBackendConnected() {
 		if ((accountJid != null) && (contactJid != null)) {
 			Account account = xmppConnectionService
-					.findAccountByJid(accountJid);
+				.findAccountByJid(accountJid);
 			if (account == null) {
 				return;
 			}
@@ -414,4 +417,15 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 			populateView();
 		}
 	}
+
+	@Override
+	public void OnUpdateBlocklist(final Status status) {
+		runOnUiThread(new Runnable() {
+
+			@Override
+			public void run() {
+				populateView();
+			}
+		});
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 5b0fa562..5cfc1116 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -9,13 +9,13 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
+import android.media.MediaActionSound;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.provider.MediaStore;
 import android.support.v4.widget.SlidingPaneLayout;
 import android.support.v4.widget.SlidingPaneLayout.PanelSlideListener;
-import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -28,10 +28,14 @@ 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.Account;
+import eu.siacs.conversations.entities.Blockable;
 import eu.siacs.conversations.entities.Contact;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
@@ -40,27 +44,23 @@ import eu.siacs.conversations.services.XmppConnectionService.OnConversationUpdat
 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;
 
-public class ConversationActivity extends XmppActivity implements
-		OnAccountUpdate, OnConversationUpdate, OnRosterUpdate {
+public class ConversationActivity extends XmppActivity
+	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist {
 
 	public static final String VIEW_CONVERSATION = "viewConversation";
 	public static final String CONVERSATION = "conversationUuid";
 	public static final String TEXT = "text";
 	public static final String NICK = "nick";
-	public static final String PRESENCE = "eu.siacs.conversations.presence";
 
 	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 REQUEST_ATTACH_IMAGE_DIALOG = 0x0203;
-	private static final int REQUEST_IMAGE_CAPTURE = 0x0204;
-	private static final int REQUEST_RECORD_AUDIO = 0x0205;
-	private static final int REQUEST_SEND_PGP_IMAGE = 0x0206;
-	private static final int REQUEST_ATTACH_FILE_DIALOG = 0x0208;
 	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 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";
@@ -81,6 +81,8 @@ public class ConversationActivity extends XmppActivity implements
 
 	private Toast prepareFileToast;
 
+	private boolean mActivityPaused = false;
+
 
 	public List<Conversation> getConversationList() {
 		return this.conversationList;
@@ -94,10 +96,6 @@ public class ConversationActivity extends XmppActivity implements
 		this.mSelectedConversation = conversation;
 	}
 
-	public ListView getConversationListView() {
-		return this.listView;
-	}
-
 	public void showConversationsOverview() {
 		if (mContentView instanceof SlidingPaneLayout) {
 			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
@@ -144,12 +142,12 @@ public class ConversationActivity extends XmppActivity implements
 	protected void onCreate(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);
-			}
+				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);
@@ -172,7 +170,7 @@ public class ConversationActivity extends XmppActivity implements
 
 			@Override
 			public void onItemClick(AdapterView<?> arg0, View clickedView,
-									int position, long arg3) {
+					int position, long arg3) {
 				if (getSelectedConversation() != conversationList.get(position)) {
 					setSelectedConversation(conversationList.get(position));
 					ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
@@ -188,7 +186,7 @@ public class ConversationActivity extends XmppActivity implements
 			SlidingPaneLayout mSlidingPaneLayout = (SlidingPaneLayout) mContentView;
 			mSlidingPaneLayout.setParallaxDistance(150);
 			mSlidingPaneLayout
-					.setShadowResource(R.drawable.es_slidingpane_shadow);
+				.setShadowResource(R.drawable.es_slidingpane_shadow);
 			mSlidingPaneLayout.setSliderFadeColor(0);
 			mSlidingPaneLayout.setPanelSlideListener(new PanelSlideListener() {
 
@@ -199,7 +197,7 @@ public class ConversationActivity extends XmppActivity implements
 					hideKeyboard();
 					if (xmppConnectionServiceBound) {
 						xmppConnectionService.getNotificationService()
-								.setOpenConversation(null);
+							.setOpenConversation(null);
 					}
 					closeContextMenu();
 				}
@@ -244,7 +242,7 @@ public class ConversationActivity extends XmppActivity implements
 				if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) {
 					ab.setTitle(conversation.getName());
 				} else {
-					ab.setTitle(conversation.getContactJid().toBareJid().toString());
+					ab.setTitle(conversation.getJid().toBareJid().toString());
 				}
 			} else {
 				ab.setDisplayHomeAsUpEnabled(false);
@@ -258,28 +256,33 @@ public class ConversationActivity extends XmppActivity implements
 		this.updateActionBarTitle();
 		this.invalidateOptionsMenu();
 		if (xmppConnectionServiceBound) {
-			xmppConnectionService.getNotificationService().setOpenConversation(getSelectedConversation());
-			if (!getSelectedConversation().isRead()) {
-				xmppConnectionService.markRead(getSelectedConversation(), true);
-				listView.invalidateViews();
-			}
+			final Conversation conversation = getSelectedConversation();
+			xmppConnectionService.getNotificationService().setOpenConversation(conversation);
+			sendReadMarkerIfNecessary(conversation);
+		}
+	}
+
+	public void sendReadMarkerIfNecessary(final Conversation conversation) {
+		if (!mActivityPaused && !conversation.isRead()) {
+			xmppConnectionService.sendReadMarker(conversation);
 		}
 	}
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getMenuInflater().inflate(R.menu.conversations, menu);
-		MenuItem menuSecure = menu.findItem(R.id.action_security);
-		MenuItem menuArchive = menu.findItem(R.id.action_archive);
-		MenuItem menuMucDetails = menu.findItem(R.id.action_muc_details);
-		MenuItem menuContactDetails = menu
-				.findItem(R.id.action_contact_details);
-		MenuItem menuAttach = menu.findItem(R.id.action_attach_file);
-		MenuItem menuClearHistory = menu.findItem(R.id.action_clear_history);
-		MenuItem menuAdd = menu.findItem(R.id.action_add);
-		MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
-		MenuItem menuMute = menu.findItem(R.id.action_mute);
-		MenuItem menuUnmute = menu.findItem(R.id.action_unmute);
+		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);
+		final MenuItem menuBlock = menu.findItem(R.id.action_block);
+		final MenuItem menuUnblock = menu.findItem(R.id.action_unblock);
 
 		if (isConversationsOverviewVisable()
 				&& isConversationsOverviewHideable()) {
@@ -292,19 +295,33 @@ public class ConversationActivity extends XmppActivity implements
 			menuClearHistory.setVisible(false);
 			menuMute.setVisible(false);
 			menuUnmute.setVisible(false);
+			menuBlock.setVisible(false);
+			menuUnblock.setVisible(false);
 		} else {
 			menuAdd.setVisible(!isConversationsOverviewHideable());
 			if (this.getSelectedConversation() != null) {
 				if (this.getSelectedConversation().getLatestMessage()
 						.getEncryption() != Message.ENCRYPTION_NONE) {
 					menuSecure.setIcon(R.drawable.ic_action_secure);
-				}
+						}
 				if (this.getSelectedConversation().getMode() == Conversation.MODE_MULTI) {
 					menuContactDetails.setVisible(false);
 					menuAttach.setVisible(false);
+					menuBlock.setVisible(false);
+					menuUnblock.setVisible(false);
 				} else {
 					menuMucDetails.setVisible(false);
 					menuInviteContact.setTitle(R.string.conference_with);
+					if (this.getSelectedConversation().isBlocked()) {
+						menuBlock.setVisible(false);
+					} else {
+						menuUnblock.setVisible(false);
+					}
+					final Account account = this.getSelectedConversation().getAccount();
+					if (!(account.isOnlineAndConnected() && account.getXmppConnection().getFeatures().blocking())) {
+						menuBlock.setVisible(false);
+						menuUnblock.setVisible(false);
+					}
 				}
 				if (this.getSelectedConversation().isMuted()) {
 					menuMute.setVisible(false);
@@ -321,33 +338,37 @@ public class ConversationActivity extends XmppActivity implements
 
 			@Override
 			public void onPresenceSelected() {
-				if (attachmentChoice == ATTACHMENT_CHOICE_TAKE_PHOTO) {
-					mPendingImageUri = xmppConnectionService.getFileBackend()
-							.getTakePhotoUri();
-					Intent takePictureIntent = new Intent(
-							MediaStore.ACTION_IMAGE_CAPTURE);
-					takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT,
-							mPendingImageUri);
-					if (takePictureIntent.resolveActivity(getPackageManager()) != null) {
-						startActivityForResult(takePictureIntent,
-								REQUEST_IMAGE_CAPTURE);
+				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;
+				}
+				if (intent.resolveActivity(getPackageManager()) != null) {
+					if (chooser) {
+						startActivityForResult(
+								Intent.createChooser(intent,getString(R.string.perform_action_with)),
+								attachmentChoice);
+					} else {
+						startActivityForResult(intent, attachmentChoice);
 					}
-				} else if (attachmentChoice == ATTACHMENT_CHOICE_CHOOSE_IMAGE) {
-					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_ATTACH_IMAGE_DIALOG);
-				} else if (attachmentChoice == ATTACHMENT_CHOICE_CHOOSE_FILE) {
-					Intent attachFileIntent = new Intent();
-					//attachFileIntent.setType("file/*");
-					attachFileIntent.setType("*/*");
-					attachFileIntent.addCategory(Intent.CATEGORY_OPENABLE);
-					attachFileIntent.setAction(Intent.ACTION_GET_CONTENT);
-					Intent chooser = Intent.createChooser(attachFileIntent,
-							getString(R.string.attach_file));
-					startActivityForResult(chooser, REQUEST_ATTACH_FILE_DIALOG);
 				}
 			}
 		});
@@ -364,7 +385,7 @@ public class ConversationActivity extends XmppActivity implements
 
 								@Override
 								public void userInputRequried(PendingIntent pi,
-															  Contact contact) {
+										Contact contact) {
 									ConversationActivity.this.runIntent(pi,
 											attachmentChoice);
 								}
@@ -381,18 +402,18 @@ public class ConversationActivity extends XmppActivity implements
 							});
 				} else {
 					final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-							.findFragmentByTag("conversation");
+						.findFragmentByTag("conversation");
 					if (fragment != null) {
 						fragment.showNoPGPKeyDialog(false,
 								new OnClickListener() {
 
 									@Override
 									public void onClick(DialogInterface dialog,
-														int which) {
+											int which) {
 										conversation
-												.setNextEncryption(Message.ENCRYPTION_NONE);
+											.setNextEncryption(Message.ENCRYPTION_NONE);
 										xmppConnectionService.databaseBackend
-												.updateConversation(conversation);
+											.updateConversation(conversation);
 										selectPresenceToAttachFile(attachmentChoice);
 									}
 								});
@@ -402,7 +423,7 @@ public class ConversationActivity extends XmppActivity implements
 				showInstallPgpDialog();
 			}
 		} else if (getSelectedConversation().getNextEncryption(
-				forceEncryption()) == Message.ENCRYPTION_NONE) {
+					forceEncryption()) == Message.ENCRYPTION_NONE) {
 			selectPresenceToAttachFile(attachmentChoice);
 		} else {
 			selectPresenceToAttachFile(attachmentChoice);
@@ -410,7 +431,7 @@ public class ConversationActivity extends XmppActivity implements
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		if (item.getItemId() == android.R.id.home) {
 			showConversationsOverview();
 			return true;
@@ -455,6 +476,12 @@ public class ConversationActivity extends XmppActivity implements
 				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;
 			}
@@ -483,7 +510,7 @@ public class ConversationActivity extends XmppActivity implements
 		View dialogView = getLayoutInflater().inflate(
 				R.layout.dialog_clear_history, null);
 		final CheckBox endConversationCheckBox = (CheckBox) dialogView
-				.findViewById(R.id.end_conversation_checkbox);
+			.findViewById(R.id.end_conversation_checkbox);
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
@@ -491,10 +518,12 @@ public class ConversationActivity extends XmppActivity implements
 
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
-						ConversationActivity.this.xmppConnectionService
-								.clearConversationHistory(conversation);
+						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
 						if (endConversationCheckBox.isChecked()) {
 							endConversation(conversation);
+						} else {
+							updateConversationList();
+							ConversationActivity.this.mConversationFragment.updateMessages();
 						}
 					}
 				});
@@ -508,28 +537,68 @@ public class ConversationActivity extends XmppActivity implements
 		}
 		PopupMenu attachFilePopup = new PopupMenu(this, menuAttachFile);
 		attachFilePopup.inflate(R.menu.attachment_choices);
-		attachFilePopup
-				.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+		if (new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION).resolveActivity(getPackageManager()) == null) {
+			attachFilePopup.getMenu().findItem(R.id.attach_record_voice).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_record_voice:
-								attachFile(ATTACHMENT_CHOICE_CHOOSE_FILE);
-								break;
-						}
-						return false;
+				@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;
 					}
-				});
+					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) {
@@ -537,7 +606,7 @@ public class ConversationActivity extends XmppActivity implements
 		}
 		PopupMenu popup = new PopupMenu(this, menuItemView);
 		final ConversationFragment fragment = (ConversationFragment) getFragmentManager()
-				.findFragmentByTag("conversation");
+			.findFragmentByTag("conversation");
 		if (fragment != null) {
 			popup.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 
@@ -557,7 +626,7 @@ public class ConversationActivity extends XmppActivity implements
 								if (conversation.getAccount().getKeys()
 										.has("pgp_signature")) {
 									conversation
-											.setNextEncryption(Message.ENCRYPTION_PGP);
+										.setNextEncryption(Message.ENCRYPTION_PGP);
 									item.setChecked(true);
 								} else {
 									announcePgp(conversation.getAccount(),
@@ -572,7 +641,7 @@ public class ConversationActivity extends XmppActivity implements
 							break;
 					}
 					xmppConnectionService.databaseBackend
-							.updateConversation(conversation);
+						.updateConversation(conversation);
 					fragment.updateChatMsgHint();
 					return true;
 				}
@@ -597,11 +666,11 @@ public class ConversationActivity extends XmppActivity implements
 					break;
 				case Message.ENCRYPTION_PGP:
 					popup.getMenu().findItem(R.id.encryption_choice_pgp)
-							.setChecked(true);
+						.setChecked(true);
 					break;
 				default:
 					popup.getMenu().findItem(R.id.encryption_choice_none)
-							.setChecked(true);
+						.setChecked(true);
 					break;
 			}
 			popup.show();
@@ -617,17 +686,17 @@ public class ConversationActivity extends XmppActivity implements
 				new OnClickListener() {
 
 					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						long till;
+					public void onClick(final DialogInterface dialog, final int which) {
+						final long till;
 						if (durations[which] == -1) {
 							till = Long.MAX_VALUE;
 						} else {
 							till = SystemClock.elapsedRealtime()
-									+ (durations[which] * 1000);
+								+ (durations[which] * 1000);
 						}
 						conversation.setMutedTill(till);
 						ConversationActivity.this.xmppConnectionService.databaseBackend
-								.updateConversation(conversation);
+							.updateConversation(conversation);
 						updateConversationList();
 						ConversationActivity.this.mConversationFragment.updateMessages();
 						invalidateOptionsMenu();
@@ -676,6 +745,28 @@ public class ConversationActivity extends XmppActivity implements
 	}
 
 	@Override
+	public void onPause() {
+		super.onPause();
+		this.mActivityPaused = true;
+		if (this.xmppConnectionServiceBound) {
+			this.xmppConnectionService.getNotificationService().setIsInForeground(false);
+		}
+	}
+
+	@Override
+	public void onResume() {
+		super.onResume();
+		int theme = findTheme();
+		if (this.mTheme != theme) {
+			recreate();
+		}
+		this.mActivityPaused = false;
+		if (this.xmppConnectionServiceBound) {
+			this.xmppConnectionService.getNotificationService().setIsInForeground(true);
+		}
+	}
+
+	@Override
 	public void onSaveInstanceState(final Bundle savedInstanceState) {
 		Conversation conversation = getSelectedConversation();
 		if (conversation != null) {
@@ -692,6 +783,7 @@ public class ConversationActivity extends XmppActivity implements
 
 	@Override
 	void onBackendConnected() {
+		this.xmppConnectionService.getNotificationService().setIsInForeground(true);
 		updateConversationList();
 		if (xmppConnectionService.getAccounts().size() == 0) {
 			startActivity(new Intent(this, EditAccountActivity.class));
@@ -752,11 +844,11 @@ public class ConversationActivity extends XmppActivity implements
 	}
 
 	private void selectConversationByUuid(String uuid) {
-        for (Conversation aConversationList : conversationList) {
-            if (aConversationList.getUuid().equals(uuid)) {
-                setSelectedConversation(aConversationList);
-            }
-        }
+		for (Conversation aConversationList : conversationList) {
+			if (aConversationList.getUuid().equals(uuid)) {
+				setSelectedConversation(aConversationList);
+			}
+		}
 	}
 
 	@Override
@@ -767,50 +859,35 @@ public class ConversationActivity extends XmppActivity implements
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode,
-									final Intent data) {
+			final Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (resultCode == RESULT_OK) {
 			if (requestCode == REQUEST_DECRYPT_PGP) {
 				mConversationFragment.hideSnackbar();
 				mConversationFragment.updateMessages();
-			} else if (requestCode == REQUEST_ATTACH_IMAGE_DIALOG) {
+			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_IMAGE) {
 				mPendingImageUri = data.getData();
 				if (xmppConnectionServiceBound) {
-					attachImageToConversation(getSelectedConversation(),
-							mPendingImageUri);
+					attachImageToConversation(getSelectedConversation(),mPendingImageUri);
 					mPendingImageUri = null;
 				}
-			} else if (requestCode == REQUEST_ATTACH_FILE_DIALOG) {
+			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_FILE || requestCode == ATTACHMENT_CHOICE_RECORD_VOICE) {
 				mPendingFileUri = data.getData();
 				if (xmppConnectionServiceBound) {
-					attachFileToConversation(getSelectedConversation(),
-							mPendingFileUri);
+					attachFileToConversation(getSelectedConversation(),mPendingFileUri);
 					mPendingFileUri = null;
 				}
-			} else if (requestCode == REQUEST_SEND_PGP_IMAGE) {
-
-			} else if (requestCode == ATTACHMENT_CHOICE_CHOOSE_IMAGE) {
-				attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
-			} else if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
-				attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
-			} else if (requestCode == REQUEST_ANNOUNCE_PGP) {
-				announcePgp(getSelectedConversation().getAccount(),
-						getSelectedConversation());
-			} else if (requestCode == REQUEST_ENCRYPT_MESSAGE) {
-				// encryptTextMessage();
-			} else if (requestCode == REQUEST_IMAGE_CAPTURE && mPendingImageUri != null) {
+			} else if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO && mPendingImageUri != null) {
 				if (xmppConnectionServiceBound) {
-					attachImageToConversation(getSelectedConversation(),
-							mPendingImageUri);
+					attachImageToConversation(getSelectedConversation(),mPendingImageUri);
 					mPendingImageUri = null;
 				}
-				Intent intent = new Intent(
-						Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
+				Intent intent = new Intent(Intent.ACTION_MEDIA_SCANNER_SCAN_FILE);
 				intent.setData(mPendingImageUri);
 				sendBroadcast(intent);
 			}
 		} else {
-			if (requestCode == REQUEST_IMAGE_CAPTURE) {
+			if (requestCode == ATTACHMENT_CHOICE_TAKE_PHOTO) {
 				mPendingImageUri = null;
 			}
 		}
@@ -848,10 +925,8 @@ public class ConversationActivity extends XmppActivity implements
 
 					@Override
 					public void userInputRequried(PendingIntent pi,
-												  Message object) {
+							Message object) {
 						hidePrepareFileToast();
-						ConversationActivity.this.runIntent(pi,
-								ConversationActivity.REQUEST_SEND_PGP_IMAGE);
 					}
 
 					@Override
@@ -881,7 +956,7 @@ public class ConversationActivity extends XmppActivity implements
 
 	public void updateConversationList() {
 		xmppConnectionService
-				.populateWithOrderedConversations(conversationList);
+			.populateWithOrderedConversations(conversationList);
 		listAdapter.notifyDataSetChanged();
 	}
 
@@ -899,7 +974,7 @@ public class ConversationActivity extends XmppActivity implements
 
 					@Override
 					public void userInputRequried(PendingIntent pi,
-												  Message message) {
+							Message message) {
 						ConversationActivity.this.runIntent(pi,
 								ConversationActivity.REQUEST_SEND_MESSAGE);
 					}
@@ -951,7 +1026,7 @@ public class ConversationActivity extends XmppActivity implements
 				updateConversationList();
 				if (conversationList.size() == 0) {
 					startActivity(new Intent(getApplicationContext(),
-							StartConversationActivity.class));
+								StartConversationActivity.class));
 					finish();
 				}
 				ConversationActivity.this.mConversationFragment.updateMessages();
@@ -964,12 +1039,31 @@ public class ConversationActivity extends XmppActivity implements
 	public void onRosterUpdate() {
 		runOnUiThread(new Runnable() {
 
-				@Override
-				public void run() {
-					updateConversationList();
-					ConversationActivity.this.mConversationFragment.updateMessages();
-					updateActionBarTitle();
-				}
-			});
+			@Override
+			public void run() {
+				updateConversationList();
+				ConversationActivity.this.mConversationFragment.updateMessages();
+				updateActionBarTitle();
+			}
+		});
+	}
+
+	@Override
+	public void OnUpdateBlocklist(Status status) {
+		invalidateOptionsMenu();
+		runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				ConversationActivity.this.mConversationFragment.updateMessages();
+			}
+		});
+	}
+
+	public void unblockConversation(final Blockable conversation) {
+		xmppConnectionService.sendUnblockRequest(conversation);
+	}
+
+	public void blockConversation(final Blockable conversation) {
+		xmppConnectionService.sendBlockRequest(conversation);
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0edc6b6f..93a4cc7e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -103,7 +103,9 @@ public class ConversationFragment extends Fragment {
 	private RelativeLayout snackbar;
 	private TextView snackbarMessage;
 	private TextView snackbarAction;
-	private boolean messagesLoaded = false;
+	private boolean messagesLoaded = true;
+	private Toast messageLoaderToast;
+
 	private OnScrollListener mOnScrollListener = new OnScrollListener() {
 
 		@Override
@@ -114,20 +116,69 @@ public class ConversationFragment extends Fragment {
 
 		@Override
 		public void onScroll(AbsListView view, int firstVisibleItem,
-							 int visibleItemCount, int totalItemCount) {
+				int visibleItemCount, int totalItemCount) {
 			synchronized (ConversationFragment.this.messageList) {
-				if (firstVisibleItem == 0 && messagesLoaded) {
+				if (firstVisibleItem < 5 && messagesLoaded && messageList.size() > 0) {
 					long timestamp = ConversationFragment.this.messageList.get(0).getTimeSent();
 					messagesLoaded = false;
-					int size = activity.xmppConnectionService.loadMoreMessages(conversation, timestamp);
-					ConversationFragment.this.messageList.clear();
-					ConversationFragment.this.messageList.addAll(conversation.getMessages());
-					updateStatusMessages();
-					messageListAdapter.notifyDataSetChanged();
-					if (size != 0) {
-						messagesLoaded = true;
-					}
-					messagesView.setSelectionFromTop(size + 1, 0);
+					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();
+								}
+							});
+
+						}
+					});
+
 				}
 			}
 		}
@@ -153,13 +204,7 @@ public class ConversationFragment extends Fragment {
 
 		@Override
 		public void onClick(View v) {
-			if (conversation.getOtrFingerprint() != null) {
-				Intent intent = new Intent(getActivity(), VerifyOTRActivity.class);
-				intent.setAction(VerifyOTRActivity.ACTION_VERIFY_CONTACT);
-				intent.putExtra("contact", conversation.getContact().getJid().toBareJid().toString());
-				intent.putExtra("account", conversation.getAccount().getJid().toBareJid().toString());
-				startActivity(intent);
-			}
+			activity.verifyOtrSessionDialog(conversation,v);
 		}
 	};
 	private ConcurrentLinkedQueue<Message> mEncryptedMessages = new ConcurrentLinkedQueue<>();
@@ -170,7 +215,7 @@ public class ConversationFragment extends Fragment {
 		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);
+					.getSystemService(Context.INPUT_METHOD_SERVICE);
 				imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
 				sendMessage();
 				return true;
@@ -213,7 +258,7 @@ public class ConversationFragment extends Fragment {
 		}
 		Message message = new Message(conversation, mEditMessage.getText()
 				.toString(), conversation.getNextEncryption(activity
-				.forceEncryption()));
+					.forceEncryption()));
 		if (conversation.getMode() == Conversation.MODE_MULTI) {
 			if (conversation.getNextCounterpart() != null) {
 				message.setCounterpart(conversation.getNextCounterpart());
@@ -234,13 +279,13 @@ public class ConversationFragment extends Fragment {
 		if (conversation.getMode() == Conversation.MODE_MULTI
 				&& conversation.getNextCounterpart() != null) {
 			this.mEditMessage.setHint(getString(
-					R.string.send_private_message_to,
-					conversation.getNextCounterpart().getResourcepart()));
+						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));
+						.setHint(getString(R.string.send_plain_text_message));
 					break;
 				case Message.ENCRYPTION_OTR:
 					mEditMessage.setHint(getString(R.string.send_otr_message));
@@ -256,7 +301,7 @@ public class ConversationFragment extends Fragment {
 
 	@Override
 	public View onCreateView(final LayoutInflater inflater,
-							 ViewGroup container, Bundle savedInstanceState) {
+			ViewGroup container, Bundle savedInstanceState) {
 		final View view = inflater.inflate(R.layout.fragment_conversation,
 				container, false);
 		mEditMessage = (EditMessage) view.findViewById(R.id.textinput);
@@ -289,49 +334,51 @@ public class ConversationFragment extends Fragment {
 		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());
-									}
-								}
+			@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 {
-								Contact contact = message.getConversation()
-										.getContact();
-								if (contact.showInRoster()) {
-									activity.switchToContactDetails(contact);
-								} else {
-									activity.showAddToRosterDialog(message
-											.getConversation());
-								}
+								highlightInConference(message.getCounterpart().toString());
 							}
+						}
+					} else {
+						Contact contact = message.getConversation()
+							.getContact();
+						if (contact.showInRoster()) {
+							activity.switchToContactDetails(contact);
 						} else {
-							Account account = message.getConversation().getAccount();
-							Intent intent = new Intent(activity, EditAccountActivity.class);
-							intent.putExtra("jid", account.getJid().toBareJid().toString());
-							startActivity(intent);
+							activity.showAddToRosterDialog(message
+									.getConversation());
 						}
 					}
-				});
+				} 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() {
+			.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());
-								}
+				@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);
@@ -341,7 +388,7 @@ public class ConversationFragment extends Fragment {
 
 	@Override
 	public void onCreateContextMenu(ContextMenu menu, View v,
-									ContextMenuInfo menuInfo) {
+			ContextMenuInfo menuInfo) {
 		synchronized (this.messageList) {
 			super.onCreateContextMenu(menu, v, menuInfo);
 			AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
@@ -351,7 +398,8 @@ public class ConversationFragment extends Fragment {
 	}
 
 	private void populateContextMenu(ContextMenu menu) {
-		if (this.selectedMessage.getType() != Message.TYPE_STATUS) {
+		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);
@@ -360,29 +408,26 @@ public class ConversationFragment extends Fragment {
 			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 (this.selectedMessage.getType() != Message.TYPE_TEXT
-					|| this.selectedMessage.getDownloadable() != null) {
+			if (m.getType() != Message.TYPE_TEXT || m.getDownloadable() != null) {
 				copyText.setVisible(false);
 			}
-			if (this.selectedMessage.getType() != Message.TYPE_IMAGE
-					|| this.selectedMessage.getDownloadable() != null) {
+			if (m.getType() != Message.TYPE_IMAGE || m.getDownloadable() != null) {
 				shareImage.setVisible(false);
 			}
-			if (this.selectedMessage.getStatus() != Message.STATUS_SEND_FAILED) {
+			if (m.getStatus() != Message.STATUS_SEND_FAILED) {
 				sendAgain.setVisible(false);
 			}
-			if ((this.selectedMessage.getType() != Message.TYPE_IMAGE && this.selectedMessage
-					.getDownloadable() == null)
-					|| this.selectedMessage.getImageParams().url == null) {
+			if ((m.getType() != Message.TYPE_IMAGE && m.getDownloadable() == null)
+					|| m.getImageParams().url == null) {
 				copyUrl.setVisible(false);
 			}
-			if (this.selectedMessage.getType() != Message.TYPE_TEXT
-					|| this.selectedMessage.getDownloadable() != null
-					|| !this.selectedMessage.bodyContainsDownloadable()) {
+			if (m.getType() != Message.TYPE_TEXT
+					|| m.getDownloadable() != null
+					|| !m.bodyContainsDownloadable()) {
 				downloadImage.setVisible(false);
 			}
-			if (this.selectedMessage.getDownloadable() == null
-					|| this.selectedMessage.getDownloadable() instanceof DownloadablePlaceholder) {
+			if (!((m.getDownloadable() != null && !(m.getDownloadable() instanceof DownloadablePlaceholder))
+					|| (m.isFileOrImage() && m.getStatus() == Message.STATUS_WAITING))) {
 				cancelTransmission.setVisible(false);
 			}
 		}
@@ -419,16 +464,16 @@ public class ConversationFragment extends Fragment {
 		shareIntent.setAction(Intent.ACTION_SEND);
 		shareIntent.putExtra(Intent.EXTRA_STREAM,
 				activity.xmppConnectionService.getFileBackend()
-						.getJingleFileUri(message));
+				.getJingleFileUri(message));
 		shareIntent.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 		shareIntent.setType("image/webp");
 		activity.startActivity(Intent.createChooser(shareIntent,
-				getText(R.string.share_with)));
+					getText(R.string.share_with)));
 	}
 
 	private void copyText(Message message) {
 		if (activity.copyTextToClipboard(message.getMergedBody(),
-				R.string.message_text)) {
+					R.string.message_text)) {
 			Toast.makeText(activity, R.string.message_copied_to_clipboard,
 					Toast.LENGTH_SHORT).show();
 		}
@@ -448,21 +493,23 @@ public class ConversationFragment extends Fragment {
 
 	private void copyUrl(Message message) {
 		if (activity.copyTextToClipboard(
-				message.getImageParams().url.toString(), R.string.image_url)) {
+					message.getImageParams().url.toString(), R.string.image_url)) {
 			Toast.makeText(activity, R.string.url_copied_to_clipboard,
 					Toast.LENGTH_SHORT).show();
-		}
+					}
 	}
 
 	private void downloadImage(Message message) {
 		activity.xmppConnectionService.getHttpConnectionManager()
-				.createNewConnection(message);
+			.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);
 		}
 	}
 
@@ -478,9 +525,9 @@ public class ConversationFragment extends Fragment {
 			mEditMessage.getText().insert(0, nick + ": ");
 		} else {
 			if (mEditMessage.getText().charAt(
-					mEditMessage.getSelectionStart() - 1) != ' ') {
+						mEditMessage.getSelectionStart() - 1) != ' ') {
 				nick = " " + nick;
-			}
+						}
 			mEditMessage.getText().insert(mEditMessage.getSelectionStart(),
 					nick + " ");
 		}
@@ -501,6 +548,7 @@ public class ConversationFragment extends Fragment {
 		}
 		if (this.conversation != null) {
 			this.conversation.setNextMessage(mEditMessage.getText().toString());
+			this.conversation.trim();
 		}
 		this.activity = (ConversationActivity) getActivity();
 		this.conversation = conversation;
@@ -511,8 +559,13 @@ public class ConversationFragment extends Fragment {
 		}
 		this.mEditMessage.setText("");
 		this.mEditMessage.append(this.conversation.getNextMessage());
-		this.messagesView.invalidate();
+		this.messagesView.invalidateViews();
 		updateMessages();
+		this.messagesLoaded = true;
+		int size = this.messageList.size();
+		if (size > 0) {
+			messagesView.setSelection(size - 1);
+		}
 	}
 
 	public void updateMessages() {
@@ -524,12 +577,30 @@ public class ConversationFragment extends Fragment {
 			final ConversationActivity activity = (ConversationActivity) getActivity();
 			if (this.conversation != null) {
 				final Contact contact = this.conversation.getContact();
-				if (this.conversation.isMuted()) {
+				if (this.conversation.isBlocked()) {
+					showSnackbar(R.string.contact_blocked, R.string.unblock,
+							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(getActivity(), ((ConversationActivity) getActivity()).xmppConnectionService, conversation);
+									} else {
+										((ConversationActivity) getActivity()).unblockConversation(conversation);
+									}
+								}
+							});
+				} else if (this.conversation.isMuted()) {
 					showSnackbar(R.string.notifications_disabled, R.string.enable,
 							new OnClickListener() {
 
 								@Override
-								public void onClick(View v) {
+								public void onClick(final View v) {
 									activity.unmuteConversation(conversation);
 								}
 							});
@@ -542,7 +613,7 @@ public class ConversationFragment extends Fragment {
 								@Override
 								public void onClick(View v) {
 									activity.xmppConnectionService
-											.createContact(contact);
+										.createContact(contact);
 									activity.switchToContactDetails(contact);
 								}
 							});
@@ -579,31 +650,24 @@ public class ConversationFragment extends Fragment {
 						default:
 							break;
 					}
-				}
-				this.messageList.clear();
-				if (this.conversation.getMessages().size() == 0) {
-					messagesLoaded = false;
-				} else {
-					this.messageList.addAll(this.conversation.getMessages());
-					messagesLoaded = true;
-					for (Message message : this.messageList) {
-						if (message.getEncryption() == Message.ENCRYPTION_PGP
-								&& (message.getStatus() == Message.STATUS_RECEIVED || message
+						}
+				conversation.populateWithMessages(ConversationFragment.this.messageList);
+				for (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);
-							}
+							&& message.getDownloadable() == null) {
+						if (!mEncryptedMessages.contains(message)) {
+							mEncryptedMessages.add(message);
 						}
-					}
-					decryptNext();
-					updateStatusMessages();
+							}
 				}
+				decryptNext();
+				updateStatusMessages();
 				this.messageListAdapter.notifyDataSetChanged();
 				updateChatMsgHint();
 				if (!activity.isConversationsOverviewVisable() || !activity.isConversationsOverviewHideable()) {
-					activity.xmppConnectionService.markRead(conversation, true);
-					activity.updateConversationList();
+					activity.sendReadMarkerIfNecessary(conversation);
 				}
 				this.updateSendButton();
 			}
@@ -667,44 +731,44 @@ public class ConversationFragment extends Fragment {
 				switch (c.getContact().getMostAvailableStatus()) {
 					case Presences.CHAT:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_online);
+							.setImageResource(R.drawable.ic_action_send_now_online);
 						break;
 					case Presences.ONLINE:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_online);
+							.setImageResource(R.drawable.ic_action_send_now_online);
 						break;
 					case Presences.AWAY:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_away);
+							.setImageResource(R.drawable.ic_action_send_now_away);
 						break;
 					case Presences.XA:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_away);
+							.setImageResource(R.drawable.ic_action_send_now_away);
 						break;
 					case Presences.DND:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_dnd);
+							.setImageResource(R.drawable.ic_action_send_now_dnd);
 						break;
 					default:
 						this.mSendButton
-								.setImageResource(R.drawable.ic_action_send_now_offline);
+							.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);
+						.setImageResource(R.drawable.ic_action_send_now_online);
 				} else {
 					this.mSendButton
-							.setImageResource(R.drawable.ic_action_send_now_offline);
+						.setImageResource(R.drawable.ic_action_send_now_offline);
 				}
 			} else {
 				this.mSendButton
-						.setImageResource(R.drawable.ic_action_send_now_offline);
+					.setImageResource(R.drawable.ic_action_send_now_offline);
 			}
 		} else {
 			this.mSendButton
-					.setImageResource(R.drawable.ic_action_send_now_offline);
+				.setImageResource(R.drawable.ic_action_send_now_offline);
 		}
 	}
 
@@ -716,8 +780,7 @@ public class ConversationFragment extends Fragment {
 						return;
 					} else {
 						if (this.messageList.get(i).getStatus() == Message.STATUS_SEND_DISPLAYED) {
-							this.messageList.add(i + 1,
-									Message.createStatusMessage(conversation));
+							this.messageList.add(i + 1,Message.createStatusMessage(conversation));
 							return;
 						}
 					}
@@ -728,19 +791,30 @@ public class ConversationFragment extends Fragment {
 
 	protected void makeFingerprintWarning() {
 		if (conversation.smpRequested()) {
-			showSnackbar(R.string.smp_requested, R.string.verify, clickToVerify);
+			showSnackbar(R.string.smp_requested, R.string.verify, 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);
+				}
+			});
 		} else if (conversation.hasValidOtrSession() && (conversation.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED)
 				&& (!conversation.isOtrFingerprintVerified())) {
 			showSnackbar(R.string.unknown_otr_fingerprint, R.string.verify, clickToVerify);
-		}
+				}
 	}
 
-	protected void showSnackbar(int message, int action,
-								OnClickListener clickListener) {
+	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);
 	}
@@ -767,7 +841,7 @@ public class ConversationFragment extends Fragment {
 
 								@Override
 								public void userInputRequried(PendingIntent pi,
-															  Contact contact) {
+										Contact contact) {
 									activity.runIntent(
 											pi,
 											ConversationActivity.REQUEST_ENCRYPT_MESSAGE);
@@ -791,11 +865,11 @@ public class ConversationFragment extends Fragment {
 
 								@Override
 								public void onClick(DialogInterface dialog,
-													int which) {
+										int which) {
 									conversation
-											.setNextEncryption(Message.ENCRYPTION_NONE);
+										.setNextEncryption(Message.ENCRYPTION_NONE);
 									xmppService.databaseBackend
-											.updateConversation(conversation);
+										.updateConversation(conversation);
 									message.setEncryption(Message.ENCRYPTION_NONE);
 									xmppService.sendMessage(message);
 									messageSent();
@@ -806,9 +880,9 @@ public class ConversationFragment extends Fragment {
 				if (conversation.getMucOptions().pgpKeysInUse()) {
 					if (!conversation.getMucOptions().everybodyHasKeys()) {
 						Toast warning = Toast
-								.makeText(getActivity(),
-										R.string.missing_public_keys,
-										Toast.LENGTH_LONG);
+							.makeText(getActivity(),
+									R.string.missing_public_keys,
+									Toast.LENGTH_LONG);
 						warning.setGravity(Gravity.CENTER_VERTICAL, 0, 0);
 						warning.show();
 					}
@@ -820,12 +894,12 @@ public class ConversationFragment extends Fragment {
 
 								@Override
 								public void onClick(DialogInterface dialog,
-													int which) {
+										int which) {
 									conversation
-											.setNextEncryption(Message.ENCRYPTION_NONE);
+										.setNextEncryption(Message.ENCRYPTION_NONE);
 									message.setEncryption(Message.ENCRYPTION_NONE);
 									xmppService.databaseBackend
-											.updateConversation(conversation);
+										.updateConversation(conversation);
 									xmppService.sendMessage(message);
 									messageSent();
 								}
@@ -838,7 +912,7 @@ public class ConversationFragment extends Fragment {
 	}
 
 	public void showNoPGPKeyDialog(boolean plural,
-								   DialogInterface.OnClickListener listener) {
+			DialogInterface.OnClickListener listener) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
 		builder.setIconAttribute(android.R.attr.alertDialogIcon);
 		if (plural) {
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 8fad66cf..ea45b75e 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -19,6 +19,7 @@ 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;
 
@@ -28,13 +29,12 @@ 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.utils.Validator;
 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 {
+public class EditAccountActivity extends XmppActivity implements OnAccountUpdate{
 
 	private AutoCompleteTextView mAccountJid;
 	private EditText mPassword;
@@ -42,10 +42,15 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	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;
@@ -58,22 +63,16 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	private boolean mFetchingAvatar = false;
 
-	private OnClickListener mSaveButtonClickListener = new OnClickListener() {
+	private final OnClickListener mSaveButtonClickListener = new OnClickListener() {
 
 		@Override
-		public void onClick(View v) {
-			if (mAccount != null
-					&& mAccount.getStatus() == Account.State.DISABLED) {
+		public void onClick(final View v) {
+			if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED) {
 				mAccount.setOption(Account.OPTION_DISABLED, false);
 				xmppConnectionService.updateAccount(mAccount);
 				return;
 			}
-			if (!Validator.isValidJid(mAccountJid.getText().toString())) {
-				mAccountJid.setError(getString(R.string.invalid_jid));
-				mAccountJid.requestFocus();
-				return;
-			}
-			boolean registerNewAccount = mRegisterNew.isChecked();
+			final boolean registerNewAccount = mRegisterNew.isChecked();
 			final Jid jid;
 			try {
 				jid = Jid.fromString(mAccountJid.getText().toString());
@@ -82,37 +81,41 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				mAccountJid.requestFocus();
 				return;
 			}
-			String password = mPassword.getText().toString();
-			String passwordConfirm = mPasswordConfirm.getText().toString();
+			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.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;
+				}
 				mAccount.setPassword(password);
-                try {
-                    mAccount.setUsername(jid.hasLocalpart() ? jid.getLocalpart() : "");
-                    mAccount.setServer(jid.getDomainpart());
-                } catch (final InvalidJidException ignored) {
-                }
 				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 (InvalidJidException e) {
-                    return;
-                }
-                mAccount = new Account(jid.toBareJid(), password);
+				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);
@@ -127,82 +130,81 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 		}
 	};
-	private OnClickListener mCancelButtonClickListener = new OnClickListener() {
+	private final OnClickListener mCancelButtonClickListener = new OnClickListener() {
 
 		@Override
-		public void onClick(View v) {
+		public void onClick(final View v) {
 			finish();
 		}
 	};
-		@Override
-		public void onAccountUpdate() {
-			runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-					if (mAccount != null
-							&& mAccount.getStatus() != Account.State.ONLINE
-							&& mFetchingAvatar) {
-						startActivity(new Intent(getApplicationContext(),
+	@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();
+					finish();
+				} else if (jidToEdit == null && mAccount != null
+						&& mAccount.getStatus() == Account.State.ONLINE) {
+					if (!mFetchingAvatar) {
+						mFetchingAvatar = true;
+						xmppConnectionService.checkForAvatar(mAccount,
+								mAvatarFetchCallback);
 					}
+				} else {
+					updateSaveButton();
 				}
-			});
-		}
-	private UiCallback<Avatar> mAvatarFetchCallback = new UiCallback<Avatar>() {
+				if (mAccount != null) {
+					updateAccountInformation();
+				}
+			}
+		});
+	}
+	private final UiCallback<Avatar> mAvatarFetchCallback = new UiCallback<Avatar>() {
 
 		@Override
-		public void userInputRequried(PendingIntent pi, Avatar avatar) {
+		public void userInputRequried(final PendingIntent pi, final Avatar avatar) {
 			finishInitialSetup(avatar);
 		}
 
 		@Override
-		public void success(Avatar avatar) {
+		public void success(final Avatar avatar) {
 			finishInitialSetup(avatar);
 		}
 
 		@Override
-		public void error(int errorCode, Avatar avatar) {
+		public void error(final int errorCode, final Avatar avatar) {
 			finishInitialSetup(avatar);
 		}
 	};
-    private TextWatcher mTextWatcher = new TextWatcher() {
+	private final TextWatcher mTextWatcher = new TextWatcher() {
 
 		@Override
-		public void onTextChanged(CharSequence s, int start, int before,
-								  int count) {
+		public void onTextChanged(final CharSequence s, final int start, final int before, final int count) {
 			updateSaveButton();
 		}
 
 		@Override
-		public void beforeTextChanged(CharSequence s, int start, int count,
-									  int after) {
-
+		public void beforeTextChanged(final CharSequence s, final int start, final int count, final int after) {
 		}
 
 		@Override
-		public void afterTextChanged(Editable s) {
+		public void afterTextChanged(final Editable s) {
 
 		}
 	};
-	private OnClickListener mAvatarClickListener = new OnClickListener() {
+
+	private final OnClickListener mAvatarClickListener = new OnClickListener() {
 		@Override
-		public void onClick(View view) {
-			if (mAccount!=null) {
-				Intent intent = new Intent(getApplicationContext(),
+		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);
@@ -215,7 +217,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 			@Override
 			public void run() {
-				Intent intent;
+				final Intent intent;
 				if (avatar != null) {
 					intent = new Intent(getApplicationContext(),
 							StartConversationActivity.class);
@@ -232,13 +234,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	}
 
 	protected void updateSaveButton() {
-		if (mAccount != null
-				&& mAccount.getStatus() == Account.State.CONNECTING) {
+		if (mAccount != null && mAccount.getStatus() == Account.State.CONNECTING) {
 			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) {
+		} else if (mAccount != null && mAccount.getStatus() == Account.State.DISABLED) {
 			this.mSaveButton.setEnabled(true);
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
 			this.mSaveButton.setText(R.string.enable);
@@ -246,8 +246,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mSaveButton.setEnabled(true);
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
 			if (jidToEdit != null) {
-				if (mAccount != null
-						&& mAccount.getStatus() == Account.State.ONLINE) {
+				if (mAccount != null && mAccount.isOnlineAndConnected()) {
 					this.mSaveButton.setText(R.string.save);
 					if (!accountInfoEdited()) {
 						this.mSaveButton.setEnabled(false);
@@ -263,10 +262,10 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	}
 
 	protected boolean accountInfoEdited() {
-		return (!this.mAccount.getJid().toBareJid().equals(
-				this.mAccountJid.getText().toString()))
-				|| (!this.mAccount.getPassword().equals(
-				this.mPassword.getText().toString()));
+		return (!this.mAccount.getJid().toBareJid().toString().equals(
+					this.mAccountJid.getText().toString()))
+			|| (!this.mAccount.getPassword().equals(
+						this.mPassword.getText().toString()));
 	}
 
 	@Override
@@ -279,7 +278,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	}
 
 	@Override
-	protected void onCreate(Bundle savedInstanceState) {
+	protected void onCreate(final Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_edit_account);
 		this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid);
@@ -292,7 +291,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		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);
@@ -302,29 +305,41 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		this.mCancelButton = (Button) findViewById(R.id.cancel_button);
 		this.mSaveButton.setOnClickListener(this.mSaveButtonClickListener);
 		this.mCancelButton.setOnClickListener(this.mCancelButtonClickListener);
-		this.mRegisterNew
-				.setOnCheckedChangeListener(new OnCheckedChangeListener() {
-
-					@Override
-					public void onCheckedChanged(CompoundButton buttonView,
-												 boolean isChecked) {
-						if (isChecked) {
-							mPasswordConfirm.setVisibility(View.VISIBLE);
-						} else {
-							mPasswordConfirm.setVisibility(View.GONE);
-						}
-						updateSaveButton();
-					}
-				});
+		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(Menu menu) {
+	public boolean onCreateOptionsMenu(final Menu menu) {
 		super.onCreateOptionsMenu(menu);
 		getMenuInflater().inflate(R.menu.editaccount, menu);
-		MenuItem showQrCode = menu.findItem(R.id.action_show_qr_code);
+		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) {
 			showQrCode.setVisible(false);
+			showBlocklist.setVisible(false);
+			showMoreInfo.setVisible(false);
+			changePassword.setVisible(false);
+		} else if (mAccount.getStatus() != Account.State.ONLINE) {
+			showBlocklist.setVisible(false);
+			showMoreInfo.setVisible(false);
+			changePassword.setVisible(false);
+		} else if (!mAccount.getXmppConnection().getFeatures().blocking()) {
+			showBlocklist.setVisible(false);
 		}
 		return true;
 	}
@@ -333,32 +348,38 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	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) {
+			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);
-				getActionBar().setTitle(getString(R.string.account_details));
+				if (getActionBar() != null) {
+					getActionBar().setTitle(getString(R.string.account_details));
+				}
 			} else {
 				this.mAvatar.setVisibility(View.GONE);
-				getActionBar().setTitle(R.string.action_add_account);
+				if (getActionBar() != null) {
+					getActionBar().setTitle(R.string.action_add_account);
+				}
 			}
 		}
 	}
 
 	@Override
 	protected void onBackendConnected() {
-        KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
-                android.R.layout.simple_list_item_1,
-                xmppConnectionService.getKnownHosts());
+		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) {
-			getActionBar().setDisplayHomeAsUpEnabled(false);
-			getActionBar().setDisplayShowHomeEnabled(false);
+			if (getActionBar() != null) {
+				getActionBar().setDisplayHomeAsUpEnabled(false);
+				getActionBar().setDisplayShowHomeEnabled(false);
+			}
 			this.mCancelButton.setEnabled(false);
 			this.mCancelButton.setTextColor(getSecondaryTextColor());
 		}
@@ -366,6 +387,27 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		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());
@@ -381,18 +423,36 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mRegisterNew.setVisibility(View.GONE);
 			this.mRegisterNew.setChecked(false);
 		}
-		if (this.mAccount.getStatus() == Account.State.ONLINE
-				&& !this.mFetchingAvatar) {
+		if (this.mAccount.isOnlineAndConnected() && !this.mFetchingAvatar) {
 			this.mStats.setVisibility(View.VISIBLE);
-			this.mSessionEst.setText(UIHelper.readableTimeDifferenceFull(
-					getApplicationContext(), this.mAccount.getXmppConnection()
-							.getLastSessionEstablished()));
+			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);
+					.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);
@@ -409,21 +469,21 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				this.mOtrFingerprintBox.setVisibility(View.VISIBLE);
 				this.mOtrFingerprint.setText(CryptoHelper.prettifyFingerprint(fingerprint));
 				this.mOtrFingerprintToClipboardButton
-						.setVisibility(View.VISIBLE);
+					.setVisibility(View.VISIBLE);
 				this.mOtrFingerprintToClipboardButton
-						.setOnClickListener(new View.OnClickListener() {
+					.setOnClickListener(new View.OnClickListener() {
 
-							@Override
-							public void onClick(View v) {
+						@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();
-								}
+							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);
 			}
diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
index 906a16cc..b3ab5ee6 100644
--- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -26,21 +26,25 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 
 	protected Account selectedAccount = null;
 
-	protected List<Account> accountList = new ArrayList<Account>();
+	protected final List<Account> accountList = new ArrayList<>();
 	protected ListView accountListView;
 	protected AccountAdapter mAccountAdapter;
-		@Override
-		public void onAccountUpdate() {
+
+	@Override
+	public void onAccountUpdate() {
+		synchronized (this.accountList) {
 			accountList.clear();
 			accountList.addAll(xmppConnectionService.getAccounts());
-			runOnUiThread(new Runnable() {
-
-				@Override
-				public void run() {
-					mAccountAdapter.notifyDataSetChanged();
-				}
-			});
 		}
+		runOnUiThread(new Runnable() {
+
+			@Override
+			public void run() {
+				invalidateOptionsMenu();
+				mAccountAdapter.notifyDataSetChanged();
+			}
+		});
+	}
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -91,6 +95,14 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 	@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;
 	}
 
@@ -120,12 +132,18 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
-		case R.id.action_add_account:
-			startActivity(new Intent(getApplicationContext(),
-					EditAccountActivity.class));
-			break;
-		default:
-			break;
+			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);
 	}
@@ -158,6 +176,56 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 		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);
diff --git a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 609dc280..5e770376 100644
--- a/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
@@ -1,17 +1,5 @@
 package eu.siacs.conversations.ui;
 
-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;
-
 import android.app.PendingIntent;
 import android.content.Intent;
 import android.net.Uri;
@@ -25,10 +13,27 @@ 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;
@@ -38,9 +43,9 @@ public class ShareWithActivity extends XmppActivity {
 
 	private static final int REQUEST_START_NEW_CONVERSATION = 0x0501;
 	private ListView mListView;
-	private List<Conversation> mConversations = new ArrayList<Conversation>();
+	private List<Conversation> mConversations = new ArrayList<>();
 
-	private UiCallback<Message> attachImageCallback = new UiCallback<Message>() {
+	private UiCallback<Message> attachFileCallback = new UiCallback<Message>() {
 
 		@Override
 		public void userInputRequried(PendingIntent pi, Message object) {
@@ -78,11 +83,12 @@ public class ShareWithActivity extends XmppActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
-
 		super.onCreate(savedInstanceState);
 
-		getActionBar().setDisplayHomeAsUpEnabled(false);
-		getActionBar().setHomeButtonEnabled(false);
+		if (getActionBar() != null) {
+			getActionBar().setDisplayHomeAsUpEnabled(false);
+			getActionBar().setHomeButtonEnabled(false);
+		}
 
 		setContentView(R.layout.share_with);
 		setTitle(getString(R.string.title_activity_sharewith));
@@ -114,10 +120,10 @@ public class ShareWithActivity extends XmppActivity {
 	}
 
 	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.action_add:
-			Intent intent = new Intent(getApplicationContext(),
+			final Intent intent = new Intent(getApplicationContext(),
 					ChooseContactActivity.class);
 			startActivityForResult(intent, REQUEST_START_NEW_CONVERSATION);
 			return true;
@@ -127,16 +133,20 @@ public class ShareWithActivity extends XmppActivity {
 
 	@Override
 	public void onStart() {
-		if (getIntent().getType() != null
-				&& getIntent().getType().startsWith("image/")) {
-			this.share.uri = (Uri) getIntent().getParcelableExtra(
-					Intent.EXTRA_STREAM);
+		final String type = getIntent().getType();
+		if (type != null && !type.startsWith("text/")) {
+			this.share.uri = (Uri) getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
+			try {
+				this.share.image = type.startsWith("image/")
+						|| URLConnection.guessContentTypeFromName(this.share.uri.toString()).startsWith("image/");
+			} catch (final StringIndexOutOfBoundsException ignored) {
+				this.share.image = false;
+			}
 		} else {
 			this.share.text = getIntent().getStringExtra(Intent.EXTRA_TEXT);
 		}
 		if (xmppConnectionServiceBound) {
-			xmppConnectionService.populateWithOrderedConversations(
-					mConversations, this.share.uri == null);
+			xmppConnectionService.populateWithOrderedConversations(mConversations, this.share.uri == null);
 		}
 		super.onStart();
 	}
@@ -177,12 +187,21 @@ public class ShareWithActivity extends XmppActivity {
 			selectPresence(conversation, new OnPresenceSelected() {
 				@Override
 				public void onPresenceSelected() {
-					Toast.makeText(getApplicationContext(),
-							getText(R.string.preparing_image),
-							Toast.LENGTH_LONG).show();
-					ShareWithActivity.this.xmppConnectionService
+					if (share.image) {
+						Toast.makeText(getApplicationContext(),
+								getText(R.string.preparing_image),
+								Toast.LENGTH_LONG).show();
+						ShareWithActivity.this.xmppConnectionService
 							.attachImageToConversation(conversation, share.uri,
-									attachImageCallback);
+									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();
 				}
@@ -195,4 +214,4 @@ public class ShareWithActivity extends XmppActivity {
 
 	}
 
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index c8b41821..209c0a7b 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -38,6 +38,7 @@ 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;
@@ -53,19 +54,20 @@ 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.utils.XmppUri;
 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.Validator;
+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 {
+public class StartConversationActivity extends XmppActivity implements OnRosterUpdate, OnUpdateBlocklist {
 
 	public int conference_context_id;
 	public int contact_context_id;
@@ -133,7 +135,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	private ViewPager.SimpleOnPageChangeListener mOnPageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
 		@Override
 		public void onPageSelected(int position) {
-			getActionBar().setSelectedNavigationItem(position);
+			if (getActionBar() != null) {
+				getActionBar().setSelectedNavigationItem(position);
+			}
 			onTabChanged();
 		}
 	};
@@ -146,16 +150,27 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 
 		@Override
 		public void beforeTextChanged(CharSequence s, int start, int count,
-									  int after) {
+				int after) {
 		}
 
 		@Override
 		public void onTextChanged(CharSequence s, int start, int before,
-								  int count) {
+				int count) {
 		}
 	};
 	private MenuItem mMenuSearchView;
 	private String mInitialJid;
+	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);
+			}
+		}
+	};
 
 	@Override
 	public void onRosterUpdate() {
@@ -179,9 +194,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 
 		mContactsTab = actionBar.newTab().setText(R.string.contacts)
-				.setTabListener(mTabListener);
+			.setTabListener(mTabListener);
 		mConferencesTab = actionBar.newTab().setText(R.string.conferences)
-				.setTabListener(mTabListener);
+			.setTabListener(mTabListener);
 		actionBar.addTab(mContactsTab);
 		actionBar.addTab(mConferencesTab);
 
@@ -207,35 +222,36 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		mConferenceListFragment.setListAdapter(mConferenceAdapter);
 		mConferenceListFragment.setContextMenu(R.menu.conference_context);
 		mConferenceListFragment
-				.setOnListItemClickListener(new OnItemClickListener() {
+			.setOnListItemClickListener(new OnItemClickListener() {
 
-					@Override
-					public void onItemClick(AdapterView<?> arg0, View arg1,
-											int position, long arg3) {
-						openConversationForBookmark(position);
-					}
-				});
+				@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() {
+			.setOnListItemClickListener(new OnItemClickListener() {
 
-					@Override
-					public void onItemClick(AdapterView<?> arg0, View arg1,
-											int position, long arg3) {
-						openConversationForContact(position);
-					}
-				});
+				@Override
+				public void onItemClick(AdapterView<?> arg0, View arg1,
+						int position, long arg3) {
+					openConversationForContact(position);
+				}
+			});
 
 	}
 
 	protected void openConversationForContact(int position) {
 		Contact contact = (Contact) contacts.get(position);
 		Conversation conversation = xmppConnectionService
-				.findOrCreateConversation(contact.getAccount(),
-						contact.getJid(), false);
+			.findOrCreateConversation(contact.getAccount(),
+					contact.getJid(), false);
 		switchToConversation(conversation);
 	}
 
@@ -251,8 +267,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	protected void openConversationForBookmark(int position) {
 		Bookmark bookmark = (Bookmark) conferences.get(position);
 		Conversation conversation = xmppConnectionService
-				.findOrCreateConversation(bookmark.getAccount(),
-						bookmark.getJid(), true);
+			.findOrCreateConversation(bookmark.getAccount(),
+					bookmark.getJid(), true);
 		conversation.setBookmark(bookmark);
 		if (!conversation.getMucOptions().online()) {
 			xmppConnectionService.joinMuc(conversation);
@@ -270,14 +286,19 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		switchToContactDetails(contact);
 	}
 
+	protected void toggleContactBlock() {
+		final int position = contact_context_id;
+		BlockContactDialog.show(this, xmppConnectionService, (Contact)contacts.get(position));
+	}
+
 	protected void deleteContact() {
-		int position = contact_context_id;
+		final int position = contact_context_id;
 		final Contact contact = (Contact) contacts.get(position);
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+		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()));
+					contact.getJid()));
 		builder.setPositiveButton(R.string.delete, new OnClickListener() {
 
 			@Override
@@ -287,7 +308,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 			}
 		});
 		builder.create().show();
-
 	}
 
 	protected void deleteConference() {
@@ -298,7 +318,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		builder.setNegativeButton(R.string.cancel, null);
 		builder.setTitle(R.string.delete_bookmark);
 		builder.setMessage(getString(R.string.remove_bookmark_text,
-				bookmark.getJid()));
+					bookmark.getJid()));
 		builder.setPositiveButton(R.string.delete, new OnClickListener() {
 
 			@Override
@@ -318,13 +338,10 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	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);
+		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));
+		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) {
@@ -344,41 +361,37 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				new View.OnClickListener() {
 
 					@Override
-					public void onClick(View v) {
+					public void onClick(final View v) {
 						if (!xmppConnectionServiceBound) {
 							return;
 						}
-						if (Validator.isValidJid(jid.getText().toString())) {
-							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) {
-								return;
-							}
-							Account account = xmppConnectionService
-									.findAccountByJid(accountJid);
-							if (account == null) {
-								dialog.dismiss();
-								return;
-							}
-							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);
-							}
-						} else {
+						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);
 						}
 					}
 				});
@@ -386,22 +399,19 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	}
 
 	@SuppressLint("InflateParams")
-	protected void showJoinConferenceDialog(String prefilledJid) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(this);
+	protected void showJoinConferenceDialog(final String prefilledJid) {
+		final AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(R.string.join_conference);
-		View dialogView = getLayoutInflater().inflate(
-				R.layout.join_conference_dialog, null);
+		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));
+		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 CheckBox bookmarkCheckBox = (CheckBox) dialogView
-				.findViewById(R.id.bookmark);
+		final Checkable bookmarkCheckBox = (CheckBox) dialogView
+			.findViewById(R.id.bookmark);
 		builder.setView(dialogView);
 		builder.setNegativeButton(R.string.cancel, null);
 		builder.setPositiveButton(R.string.join, null);
@@ -411,62 +421,59 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				new View.OnClickListener() {
 
 					@Override
-					public void onClick(View v) {
+					public void onClick(final View v) {
 						if (!xmppConnectionServiceBound) {
 							return;
 						}
-						if (Validator.isValidJid(jid.getText().toString())) {
-							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) {
-								return; // TODO: Do some error handling...
-							}
-							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 {
-									Bookmark bookmark = new Bookmark(account,
-											conferenceJid);
-									bookmark.setAutojoin(true);
-									account.getBookmarks().add(bookmark);
-									xmppConnectionService
-											.pushBookmarks(account);
-									Conversation conversation = xmppConnectionService
-											.findOrCreateConversation(account,
-													conferenceJid, true);
-									conversation.setBookmark(bookmark);
-									if (!conversation.getMucOptions().online()) {
-										xmppConnectionService
-												.joinMuc(conversation);
-									}
-									dialog.dismiss();
-									switchToConversation(conversation);
-								}
+						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 {
-								Conversation conversation = xmppConnectionService
-										.findOrCreateConversation(account,
-												conferenceJid, true);
+								final Bookmark bookmark = new Bookmark(account,
+										conferenceJid);
+								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);
+									xmppConnectionService
+										.joinMuc(conversation);
 								}
 								dialog.dismiss();
 								switchToConversation(conversation);
 							}
 						} else {
-							jid.setError(getString(R.string.invalid_jid));
+							final Conversation conversation = xmppConnectionService
+								.findOrCreateConversation(account,
+										conferenceJid, true);
+							if (!conversation.getMucOptions().online()) {
+								xmppConnectionService.joinMuc(conversation);
+							}
+							dialog.dismiss();
+							switchToConversation(conversation);
 						}
 					}
 				});
@@ -474,8 +481,8 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 
 	protected void switchToConversation(Contact contact) {
 		Conversation conversation = xmppConnectionService
-				.findOrCreateConversation(contact.getAccount(),
-						contact.getJid(), false);
+			.findOrCreateConversation(contact.getAccount(),
+					contact.getJid(), false);
 		switchToConversation(conversation);
 	}
 
@@ -491,14 +498,14 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		this.mOptionsMenu = menu;
 		getMenuInflater().inflate(R.menu.start_conversation, menu);
 		MenuItem menuCreateContact = menu
-				.findItem(R.id.action_create_contact);
+			.findItem(R.id.action_create_contact);
 		MenuItem menuCreateConference = menu
-				.findItem(R.id.action_join_conference);
+			.findItem(R.id.action_join_conference);
 		mMenuSearchView = menu.findItem(R.id.action_search);
 		mMenuSearchView.setOnActionExpandListener(mOnActionExpandListener);
 		View mSearchView = mMenuSearchView.getActionView();
 		mSearchEditText = (EditText) mSearchView
-				.findViewById(R.id.search_field);
+			.findViewById(R.id.search_field);
 		mSearchEditText.addTextChangedListener(mSearchTextWatcher);
 		if (getActionBar().getSelectedNavigationIndex() == 0) {
 			menuCreateConference.setVisible(false);
@@ -567,7 +574,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		}
 		this.mKnownHosts = xmppConnectionService.getKnownHosts();
 		this.mKnownConferenceHosts = xmppConnectionService
-				.getKnownConferenceHosts();
+			.getKnownConferenceHosts();
 		if (this.mPendingInvite != null) {
 			mPendingInvite.invite();
 			this.mPendingInvite = null;
@@ -609,7 +616,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 											byte[] payload = record.getPayload();
 											if (payload[0] == 0) {
 												return new Invite(Uri.parse(new String(Arrays.copyOfRange(
-														payload, 1, payload.length)))).invite();
+																	payload, 1, payload.length)))).invite();
 											}
 										}
 									}
@@ -690,16 +697,29 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		invalidateOptionsMenu();
 	}
 
+	@Override
+	public void OnUpdateBlocklist(final Status status) {
+		runOnUiThread(new Runnable() {
+
+			@Override
+			public void run() {
+				if (mSearchEditText != null) {
+					filter(mSearchEditText.getText().toString());
+				}
+			}
+		});
+	}
+
 	public static class MyListFragment extends ListFragment {
 		private AdapterView.OnItemClickListener mOnItemClickListener;
 		private int mResContextMenu;
 
-		public void setContextMenu(int res) {
+		public void setContextMenu(final int res) {
 			this.mResContextMenu = res;
 		}
 
 		@Override
-		public void onListItemClick(ListView l, View v, int position, long id) {
+		public void onListItemClick(final ListView l, final View v, final int position, final long id) {
 			if (mOnItemClickListener != null) {
 				mOnItemClickListener.onItemClick(l, v, position, id);
 			}
@@ -710,28 +730,38 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		}
 
 		@Override
-		public void onViewCreated(View view, Bundle savedInstanceState) {
+		public void onViewCreated(final View view, final Bundle savedInstanceState) {
 			super.onViewCreated(view, savedInstanceState);
 			registerForContextMenu(getListView());
 			getListView().setFastScrollEnabled(true);
 		}
 
 		@Override
-		public void onCreateContextMenu(ContextMenu menu, View v,
-										ContextMenuInfo menuInfo) {
+		public void onCreateContextMenu(final ContextMenu menu, final View v,
+				final ContextMenuInfo menuInfo) {
 			super.onCreateContextMenu(menu, v, menuInfo);
-			StartConversationActivity activity = (StartConversationActivity) getActivity();
+			final StartConversationActivity activity = (StartConversationActivity) getActivity();
 			activity.getMenuInflater().inflate(mResContextMenu, menu);
-			AdapterView.AdapterContextMenuInfo acmi = (AdapterContextMenuInfo) menuInfo;
+			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(MenuItem item) {
+		public boolean onContextItemSelected(final MenuItem item) {
 			StartConversationActivity activity = (StartConversationActivity) getActivity();
 			switch (item.getItemId()) {
 				case R.id.context_start_conversation:
@@ -740,6 +770,9 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				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;
@@ -755,11 +788,11 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 
 	private class Invite extends XmppUri {
 
-		public Invite(Uri uri) {
+		public Invite(final Uri uri) {
 			super(uri);
 		}
 
-		public Invite(String uri) {
+		public Invite(final String uri) {
 			super(uri);
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/TimePreference.java b/src/main/java/eu/siacs/conversations/ui/TimePreference.java
new file mode 100644
index 00000000..e32b068c
--- /dev/null
+++ b/src/main/java/eu/siacs/conversations/ui/TimePreference.java
@@ -0,0 +1,105 @@
+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/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index e5775ab0..c33decd8 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -1,15 +1,15 @@
 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.MenuItem;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.RelativeLayout;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -32,57 +32,56 @@ 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 RelativeLayout mVerificationAreaOne;
-	private RelativeLayout mVerificationAreaTwo;
-	private TextView mErrorNoSession;
-	private TextView mRemoteJid;
+	private LinearLayout mManualVerificationArea;
+	private LinearLayout mSmpVerificationArea;
 	private TextView mRemoteFingerprint;
 	private TextView mYourFingerprint;
-	private EditText mSharedSecretHint;
-	private EditText mSharedSecretSecret;
-	private Button mButtonScanQrCode;
-	private Button mButtonShowQrCode;
-	private Button mButtonSharedSecretPositive;
-	private Button mButtonSharedSecretNegative;
+	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();
-			updateView();
 			xmppConnectionService.syncRosterToDisk(mConversation.getAccount());
+			Toast.makeText(VerifyOTRActivity.this,R.string.verified,Toast.LENGTH_SHORT).show();
+			finish();
 		}
 	};
 
-	private View.OnClickListener mShowQrCodeListener = new View.OnClickListener() {
-		@Override
-		public void onClick(final View view) {
-			showQrCode();
-		}
-	};
-
-	private View.OnClickListener mScanQrCodeListener = new View.OnClickListener() {
-
-		@Override
-		public void onClick(View view) {
-			new IntentIntegrator(VerifyOTRActivity.this).initiateScan();
-		}
-
-	};
-
 	private View.OnClickListener mCreateSharedSecretListener = new View.OnClickListener() {
 		@Override
 		public void onClick(final View view) {
 			if (isAccountOnline()) {
-				final String question = mSharedSecretHint.getText().toString();
+				final String question = mSharedSecretHintEditable.getText().toString();
 				final String secret = mSharedSecretSecret.getText().toString();
-				initSmp(question, secret);
-				updateView();
+				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();
+				}
 			}
 		}
 	};
@@ -100,7 +99,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 		@Override
 		public void onClick(View view) {
 			if (isAccountOnline()) {
-				final String question = mSharedSecretHint.getText().toString();
+				final String question = mSharedSecretHintEditable.getText().toString();
 				final String secret = mSharedSecretSecret.getText().toString();
 				respondSmp(question, secret);
 				updateView();
@@ -124,14 +123,14 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 		}
 	};
 
-	private XmppUri mPendingUri = null;
-
 	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;
@@ -172,15 +171,17 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 		}
 	}
 
-	protected void verifyWithUri(XmppUri uri) {
+	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;
 		}
 	}
 
@@ -194,7 +195,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 	}
 
 	protected boolean handleIntent(Intent intent) {
-		if (intent.getAction().equals(ACTION_VERIFY_CONTACT)) {
+		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) {
@@ -208,6 +209,11 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 			} 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;
@@ -223,9 +229,12 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 				XmppUri uri = new XmppUri(data);
 				if (xmppConnectionServiceBound) {
 					verifyWithUri(uri);
+					finish();
 				} else {
 					this.mPendingUri = uri;
 				}
+			} else {
+				finish();
 			}
 		}
 		super.onActivityResult(requestCode, requestCode, intent);
@@ -234,84 +243,139 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 	@Override
 	protected void onBackendConnected() {
 		if (handleIntent(getIntent())) {
-			if (mPendingUri!=null) {
-				verifyWithUri(mPendingUri);
-				mPendingUri = null;
-			}
 			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();
-			this.mVerificationAreaOne.setVisibility(View.VISIBLE);
-			this.mVerificationAreaTwo.setVisibility(View.VISIBLE);
-			this.mErrorNoSession.setVisibility(View.GONE);
-			this.mYourFingerprint.setText(CryptoHelper.prettifyFingerprint(this.mAccount.getOtrFingerprint()));
-			this.mRemoteFingerprint.setText(this.mConversation.getOtrFingerprint());
-			this.mRemoteJid.setText(this.mConversation.getContact().getJid().toBareJid().toString());
-			Conversation.Smp smp = mConversation.smp();
-			Session session = mConversation.getOtrSession();
-			if (mConversation.isOtrFingerprintVerified()) {
-				deactivateButton(mButtonScanQrCode, R.string.verified);
-			} else {
-				activateButton(mButtonScanQrCode, R.string.scan_qr_code, mScanQrCodeListener);
+			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;
 			}
-			if (smp.status == Conversation.Smp.STATUS_NONE) {
-				activateButton(mButtonSharedSecretPositive, R.string.create, mCreateSharedSecretListener);
-				deactivateButton(mButtonSharedSecretNegative, R.string.cancel);
-				this.mSharedSecretHint.setFocusableInTouchMode(true);
-				this.mSharedSecretSecret.setFocusableInTouchMode(true);
-				this.mSharedSecretSecret.setText("");
-				this.mSharedSecretHint.setText("");
-				this.mSharedSecretHint.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.setVisibility(View.VISIBLE);
+		} 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);
-			} else if (smp.status == Conversation.Smp.STATUS_CONTACT_REQUESTED) {
-				this.mSharedSecretHint.setFocusable(false);
-				this.mSharedSecretHint.setText(smp.hint);
-				this.mSharedSecretSecret.setFocusableInTouchMode(true);
-				this.mSharedSecretHint.setVisibility(View.VISIBLE);
+				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);
-				deactivateButton(mButtonSharedSecretNegative, R.string.cancel);
-				activateButton(mButtonSharedSecretPositive, R.string.respond, mRespondSharedSecretListener);
-			} else if (smp.status == Conversation.Smp.STATUS_FAILED) {
-				activateButton(mButtonSharedSecretNegative, R.string.cancel, mFinishListener);
-				activateButton(mButtonSharedSecretPositive, R.string.try_again, mRetrySharedSecretListener);
-				this.mSharedSecretHint.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.mStatusMessage.setText(R.string.secrets_do_not_match);
-				this.mStatusMessage.setTextColor(getWarningTextColor());
-			} else if (smp.status == Conversation.Smp.STATUS_FINISHED) {
-				this.mSharedSecretHint.setText("");
+				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.mStatusMessage.setTextColor(getPrimaryColor());
-				deactivateButton(mButtonSharedSecretNegative, R.string.cancel);
-				if (mConversation.isOtrFingerprintVerified()) {
-					activateButton(mButtonSharedSecretPositive, R.string.finish, mFinishListener);
-					this.mStatusMessage.setText(R.string.verified);
-				} else {
-					activateButton(mButtonSharedSecretPositive,R.string.reset,mRetrySharedSecretListener);
-					this.mStatusMessage.setText(R.string.secret_accepted);
-				}
-			} else if (session != null && session.isSmpInProgress()) {
-				deactivateButton(mButtonSharedSecretPositive, R.string.in_progress);
-				activateButton(mButtonSharedSecretNegative, R.string.cancel, mCancelSharedSecretListener);
-				this.mSharedSecretHint.setVisibility(View.VISIBLE);
-				this.mSharedSecretSecret.setVisibility(View.VISIBLE);
-				this.mSharedSecretHint.setFocusable(false);
-				this.mSharedSecretSecret.setFocusable(false);
-			}
-		} else {
-			this.mVerificationAreaOne.setVisibility(View.GONE);
-			this.mVerificationAreaTwo.setVisibility(View.GONE);
-			this.mErrorNoSession.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;
 		}
 	}
 
@@ -334,41 +398,25 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_verify_otr);
 		this.mRemoteFingerprint = (TextView) findViewById(R.id.remote_fingerprint);
-		this.mRemoteJid = (TextView) findViewById(R.id.remote_jid);
 		this.mYourFingerprint = (TextView) findViewById(R.id.your_fingerprint);
-		this.mButtonSharedSecretNegative = (Button) findViewById(R.id.button_shared_secret_negative);
-		this.mButtonSharedSecretPositive = (Button) findViewById(R.id.button_shared_secret_positive);
-		this.mButtonScanQrCode = (Button) findViewById(R.id.button_scan_qr_code);
-		this.mButtonShowQrCode = (Button) findViewById(R.id.button_show_qr_code);
-		this.mButtonShowQrCode.setOnClickListener(this.mShowQrCodeListener);
+		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.mSharedSecretHint = (EditText) findViewById(R.id.shared_secret_hint);
-		this.mStatusMessage= (TextView) findViewById(R.id.status_message);
-		this.mVerificationAreaOne = (RelativeLayout) findViewById(R.id.verification_area_one);
-		this.mVerificationAreaTwo = (RelativeLayout) findViewById(R.id.verification_area_two);
-		this.mErrorNoSession = (TextView) findViewById(R.id.error_no_session);
+		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(Menu menu) {
+	public boolean onCreateOptionsMenu(final Menu menu) {
+		super.onCreateOptionsMenu(menu);
 		getMenuInflater().inflate(R.menu.verify_otr, menu);
-		if (mConversation != null && mConversation.isOtrFingerprintVerified()) {
-			MenuItem manuallyVerifyItem = menu.findItem(R.id.manually_verify);
-			manuallyVerifyItem.setVisible(false);
-		}
 		return true;
 	}
 
-	@Override
-	public boolean onOptionsItemSelected(MenuItem menuItem) {
-		if (menuItem.getItemId() == R.id.manually_verify) {
-			showManuallyVerifyDialog();
-			return true;
-		} else {
-			return super.onOptionsItemSelected(menuItem);
-		}
-	}
-
 	private void showManuallyVerifyDialog() {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(R.string.manually_verify);
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 5fba1664..69dd47e7 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -71,6 +71,7 @@ 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;
 
@@ -94,6 +95,7 @@ public abstract class XmppActivity extends Activity {
 	protected boolean mUseSubject = true;
 
 	private DisplayMetrics metrics;
+	protected int mTheme;
 
 	protected interface OnValueEdited {
 		public void onValueEdited(String value);
@@ -198,7 +200,7 @@ public abstract class XmppActivity extends Activity {
 							xmppConnectionServiceBound = false;
 						}
 						stopService(new Intent(XmppActivity.this,
-								XmppConnectionService.class));
+									XmppConnectionService.class));
 						finish();
 					}
 				});
@@ -208,13 +210,13 @@ public abstract class XmppActivity extends Activity {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						Uri uri = Uri
-								.parse("market://details?id=org.sufficientlysecure.keychain");
+							.parse("market://details?id=org.sufficientlysecure.keychain");
 						Intent marketIntent = new Intent(Intent.ACTION_VIEW,
 								uri);
 						PackageManager manager = getApplicationContext()
-								.getPackageManager();
+							.getPackageManager();
 						List<ResolveInfo> infos = manager
-								.queryIntentActivities(marketIntent, 0);
+							.queryIntentActivities(marketIntent, 0);
 						if (infos.size() > 0) {
 							startActivity(marketIntent);
 						} else {
@@ -244,6 +246,9 @@ public abstract class XmppActivity extends Activity {
 		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
 			this.xmppConnectionService.setOnMucRosterUpdateListener((XmppConnectionService.OnMucRosterUpdate) this);
 		}
+		if (this instanceof OnUpdateBlocklist) {
+			this.xmppConnectionService.setOnUpdateBlocklistListener((OnUpdateBlocklist) this);
+		}
 	}
 
 	protected void unregisterListeners() {
@@ -259,9 +264,13 @@ public abstract class XmppActivity extends Activity {
 		if (this instanceof XmppConnectionService.OnMucRosterUpdate) {
 			this.xmppConnectionService.removeOnMucRosterUpdateListener();
 		}
+		if (this instanceof OnUpdateBlocklist) {
+			this.xmppConnectionService.removeOnUpdateBlocklistListener();
+		}
 	}
 
-	public boolean onOptionsItemSelected(MenuItem item) {
+	@Override
+	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch (item.getItemId()) {
 			case R.id.action_settings:
 				startActivity(new Intent(this, SettingsActivity.class));
@@ -292,15 +301,14 @@ public abstract class XmppActivity extends Activity {
 		mPrimaryColor = getResources().getColor(R.color.primary);
 		mSecondaryBackgroundColor = getResources().getColor(
 				R.color.secondarybackground);
-		if (getPreferences().getBoolean("use_larger_font", false)) {
-			setTheme(R.style.ConversationsTheme_LargerText);
-		}
+		this.mTheme = findTheme();
+		setTheme(this.mTheme);
 		mUseSubject = getPreferences().getBoolean("use_subject", true);
 	}
 
 	protected SharedPreferences getPreferences() {
 		return PreferenceManager
-				.getDefaultSharedPreferences(getApplicationContext());
+			.getDefaultSharedPreferences(getApplicationContext());
 	}
 
 	public boolean useSubjectToIdentifyConference() {
@@ -312,7 +320,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	public void switchToConversation(Conversation conversation, String text,
-									 boolean newTask) {
+			boolean newTask) {
 		switchToConversation(conversation,text,null,newTask);
 	}
 
@@ -372,7 +380,7 @@ public abstract class XmppActivity extends Activity {
 
 					@Override
 					public void userInputRequried(PendingIntent pi,
-												  Account account) {
+							Account account) {
 						try {
 							startIntentSenderForResult(pi.getIntentSender(),
 									REQUEST_ANNOUNCE_PGP, null, 0, 0, 0);
@@ -383,15 +391,15 @@ public abstract class XmppActivity extends Activity {
 					@Override
 					public void success(Account account) {
 						xmppConnectionService.databaseBackend
-								.updateAccount(account);
+							.updateAccount(account);
 						xmppConnectionService.sendPresencePacket(account,
 								xmppConnectionService.getPresenceGenerator()
-										.sendPresence(account));
+								.sendPresence(account));
 						if (conversation != null) {
 							conversation
-									.setNextEncryption(Message.ENCRYPTION_PGP);
+								.setNextEncryption(Message.ENCRYPTION_PGP);
 							xmppConnectionService.databaseBackend
-									.updateConversation(conversation);
+								.updateConversation(conversation);
 						}
 					}
 
@@ -420,7 +428,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void showAddToRosterDialog(final Conversation conversation) {
-		final Jid jid = conversation.getContactJid();
+		final Jid jid = conversation.getJid();
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(jid.toString());
 		builder.setMessage(getString(R.string.not_in_roster));
@@ -430,7 +438,7 @@ public abstract class XmppActivity extends Activity {
 
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
-						final Jid jid = conversation.getContactJid();
+						final Jid jid = conversation.getJid();
 						Account account = conversation.getAccount();
 						Contact contact = account.getRoster().getContact(jid);
 						xmppConnectionService.createContact(contact);
@@ -462,7 +470,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	private void warnMutalPresenceSubscription(final Conversation conversation,
-											   final OnPresenceSelected listener) {
+			final OnPresenceSelected listener) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);
 		builder.setTitle(conversation.getContact().getJid().toString());
 		builder.setMessage(R.string.without_mutual_presence_updates);
@@ -485,13 +493,13 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void quickPasswordEdit(String previousValue,
-									 OnValueEdited callback) {
+			OnValueEdited callback) {
 		quickEdit(previousValue, callback, true);
 	}
 
 	@SuppressLint("InflateParams")
 	private void quickEdit(final String previousValue,
-						   final OnValueEdited callback, boolean password) {
+			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);
@@ -521,7 +529,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	public void selectPresence(final Conversation conversation,
-							   final OnPresenceSelected listener) {
+			final OnPresenceSelected listener) {
 		final Contact contact = conversation.getContact();
 		if (conversation.hasValidOtrSession()) {
 			SessionID id = conversation.getOtrSession().getSessionID();
@@ -576,7 +584,7 @@ public abstract class XmppActivity extends Activity {
 
 							@Override
 							public void onClick(DialogInterface dialog,
-												int which) {
+									int which) {
 								presence.delete(0, presence.length());
 								presence.append(presencesArray[which]);
 							}
@@ -600,7 +608,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected void onActivityResult(int requestCode, int resultCode,
-									final Intent data) {
+			final Intent data) {
 		super.onActivityResult(requestCode, resultCode, data);
 		if (requestCode == REQUEST_INVITE_TO_CONVERSATION
 				&& resultCode == RESULT_OK) {
@@ -608,19 +616,19 @@ public abstract class XmppActivity extends Activity {
 				Jid jid = Jid.fromString(data.getStringExtra("contact"));
 				String conversationUuid = data.getStringExtra("conversation");
 				Conversation conversation = xmppConnectionService
-						.findConversationByUuid(conversationUuid);
+					.findConversationByUuid(conversationUuid);
 				if (conversation.getMode() == Conversation.MODE_MULTI) {
 					xmppConnectionService.invite(conversation, jid);
 				} else {
 					List<Jid> jids = new ArrayList<Jid>();
-					jids.add(conversation.getContactJid().toBareJid());
+					jids.add(conversation.getJid().toBareJid());
 					jids.add(jid);
 					xmppConnectionService.createAdhocConference(conversation.getAccount(), jids, adhocCallback);
 				}
 			} catch (final InvalidJidException ignored) {
 
 			}
-		}
+				}
 	}
 
 	private UiCallback<Conversation> adhocCallback = new UiCallback<Conversation>() {
@@ -688,18 +696,18 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	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);
-			}
+		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() {
@@ -721,6 +729,14 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
+	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();
@@ -823,13 +839,13 @@ public abstract class XmppActivity extends Activity {
 				try {
 					task.execute(message);
 				} catch (final RejectedExecutionException ignored) {
-                }
+				}
 			}
 		}
 	}
 
 	public static boolean cancelPotentialWork(Message message,
-											  ImageView imageView) {
+			ImageView imageView) {
 		final BitmapWorkerTask bitmapWorkerTask = getBitmapWorkerTask(imageView);
 
 		if (bitmapWorkerTask != null) {
@@ -858,7 +874,7 @@ public abstract class XmppActivity extends Activity {
 		private final WeakReference<BitmapWorkerTask> bitmapWorkerTaskReference;
 
 		public AsyncDrawable(Resources res, Bitmap bitmap,
-							 BitmapWorkerTask bitmapWorkerTask) {
+				BitmapWorkerTask bitmapWorkerTask) {
 			super(res, bitmap);
 			bitmapWorkerTaskReference = new WeakReference<>(
 					bitmapWorkerTask);
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index c5ee9ba6..32f95431 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
@@ -2,7 +2,6 @@ package eu.siacs.conversations.ui.adapter;
 
 import java.util.List;
 
-import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Downloadable;
@@ -35,7 +34,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 	public View getView(int position, View view, ViewGroup parent) {
 		if (view == null) {
 			LayoutInflater inflater = (LayoutInflater) activity
-					.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+				.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 			view = inflater.inflate(R.layout.conversation_list_row,
 					parent, false);
 		}
@@ -54,19 +53,19 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			}
 		}
 		TextView convName = (TextView) view
-				.findViewById(R.id.conversation_name);
+			.findViewById(R.id.conversation_name);
 		if (conversation.getMode() == Conversation.MODE_SINGLE
 				|| activity.useSubjectToIdentifyConference()) {
 			convName.setText(conversation.getName());
 		} else {
-			convName.setText(conversation.getContactJid().toBareJid().toString());
+			convName.setText(conversation.getJid().toBareJid().toString());
 		}
 		TextView mLastMessage = (TextView) view
-				.findViewById(R.id.conversation_lastmsg);
+			.findViewById(R.id.conversation_lastmsg);
 		TextView mTimestamp = (TextView) view
-				.findViewById(R.id.conversation_lastupdate);
+			.findViewById(R.id.conversation_lastupdate);
 		ImageView imagePreview = (ImageView) view
-				.findViewById(R.id.conversation_lastimage);
+			.findViewById(R.id.conversation_lastimage);
 
 		Message message = conversation.getLatestMessage();
 
@@ -154,12 +153,12 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 			imagePreview.setVisibility(View.GONE);
 		}
 		mTimestamp.setText(UIHelper.readableTimeDifference(getContext(),
-				conversation.getLatestMessage().getTimeSent()));
+					conversation.getLatestMessage().getTimeSent()));
 
 		ImageView profilePicture = (ImageView) view
-				.findViewById(R.id.conversation_image);
+			.findViewById(R.id.conversation_image);
 		profilePicture.setImageBitmap(activity.avatarService().get(
-				conversation, activity.getPixel(56)));
+					conversation, activity.getPixel(56)));
 
 		return view;
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index 0865d1aa..91fb021c 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.ui.adapter;
 
 import java.util.List;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.ListItem;
 import eu.siacs.conversations.ui.XmppActivity;
@@ -10,6 +11,7 @@ import eu.siacs.conversations.xmpp.jid.Jid;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -22,6 +24,17 @@ 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);
@@ -53,6 +66,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 				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);
 			}
 		}
@@ -68,4 +82,12 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 		return view;
 	}
 
+	public void setOnTagClickedListener(OnTagClickedListener listener) {
+		this.mOnTagClickedListener = listener;
+	}
+
+	public interface OnTagClickedListener {
+		public void onTagClicked(String tag);
+	}
+
 }
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 00000e2b..83b4e41b 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -23,7 +23,6 @@ import android.widget.Toast;
 
 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.Contact;
@@ -271,7 +270,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 			@Override
 			public void onClick(View v) {
-				startDonwloadable(message);
+				startDownloadable(message);
 			}
 		});
 		viewHolder.download_button.setOnLongClickListener(openContextMenu);
@@ -287,7 +286,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 
 			@Override
 			public void onClick(View v) {
-				openDonwloadable(file);
+				openDownloadable(file);
 			}
 		});
 		viewHolder.download_button.setOnLongClickListener(openContextMenu);
@@ -441,6 +440,8 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			}
 			view.setLayoutParams(view.getLayoutParams());
 			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) {
@@ -449,38 +450,36 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(getDisplayedMucCounterpart(message.getCounterpart()),
                         activity.getPixel(48)));
 			}
-		} else if (type == SENT && viewHolder.contact_picture != null) {
+		} else if (type == SENT) {
 			viewHolder.contact_picture.setImageBitmap(activity.avatarService().get(account, activity.getPixel(48)));
 		}
 
-		if (viewHolder != null && viewHolder.contact_picture != null) {
-			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
+				.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;
-							}
+
+					}
+				});
+		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;
 						}
-					});
-		}
+					}
+				});
 
 		if (message.getDownloadable() != null && message.getDownloadable().getStatus() != Downloadable.STATUS_UPLOADING) {
 			Downloadable d = message.getDownloadable();
@@ -549,7 +548,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		return view;
 	}
 
-	public void startDonwloadable(Message message) {
+	public void startDownloadable(Message message) {
 		Downloadable downloadable = message.getDownloadable();
 		if (downloadable != null) {
 			if (!downloadable.start()) {
@@ -559,7 +558,7 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		}
 	}
 
-	public void openDonwloadable(DownloadableFile file) {
+	public void openDownloadable(DownloadableFile file) {
 		if (!file.exists()) {
 			Toast.makeText(activity,R.string.file_deleted,Toast.LENGTH_SHORT).show();
 			return;
author	lookshe <github@lookshe.org>	2015-01-03 23:19:05 +0100
committer	lookshe <github@lookshe.org>	2015-01-03 23:19:05 +0100
commit	95e2a539517c27b3235acd582f17968c8e301e81 (patch)
tree	213bbeed798751e949376d85f4d7d0bd30c5fbfa /src/main/java/eu/siacs/conversations/ui
parent	48717dd7d37c066ab626fc626a2ced626ef21d42 (diff)
parent	4f4eff2353f4e359b5582c8e808a4e88631c3e74 (diff)