copy commits

18 files changed, 675 insertions, 544 deletions

diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index bb627ffc9..bea4f2f08 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -8,6 +8,11 @@ public final class Config {
 
 	public static final String LOGTAG = "conversations";
 
+
+	public static final String DOMAIN_LOCK = null; //only allow account creation for this domain
+	public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
+	public static final boolean HIDE_PGP_IN_UI = false; //some more consumer focused clients might want to disable OpenPGP
+
 	public static final int PING_MAX_INTERVAL = 300;
 	public static final int PING_MIN_INTERVAL = 30;
 	public static final int PING_TIMEOUT = 10;
diff --git a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
index 255939a4f..f3775b793 100644
--- a/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
+++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
@@ -49,7 +49,7 @@ public class AxolotlService {
 
 	public static final String LOGPREFIX = "AxolotlService";
 
-	public static final int NUM_KEYS_TO_PUBLISH = 10;
+	public static final int NUM_KEYS_TO_PUBLISH = 100;
 
 	private final Account account;
 	private final XmppConnectionService mXmppConnectionService;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 7720459bc..aa65c4aff 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
@@ -28,6 +28,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.crypto.PgpEngine;
 import eu.siacs.conversations.entities.Account;
@@ -421,9 +422,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
 	private void updateView() {
 		final MucOptions mucOptions = mConversation.getMucOptions();
 		final User self = mucOptions.getSelf();
-		mAccountJid.setText(getString(R.string.using_account, mConversation
-					.getAccount().getJid().toBareJid()));
-		mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(56)));
+		String account;
+		if (Config.DOMAIN_LOCK != null) {
+			account = mConversation.getAccount().getJid().getLocalpart();
+		} else {
+			account = mConversation.getAccount().getJid().toBareJid().toString();
+		}
+		mAccountJid.setText(getString(R.string.using_account, account));
+		mYourPhoto.setImageBitmap(avatarService().get(mConversation.getAccount(), getPixel(48)));
 		setTitle(mConversation.getName());
 		mFullJid.setText(mConversation.getJid().toBareJid().toString());
 		mYourNick.setText(mucOptions.getActualNick());
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 02b8962c5..5ef3f4b10 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -360,7 +360,13 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 		} else {
 			contactJidTv.setText(contact.getJid().toString());
 		}
-		accountJidTv.setText(getString(R.string.using_account, contact.getAccount().getJid().toBareJid()));
+		String account;
+		if (Config.DOMAIN_LOCK != null) {
+			account = contact.getAccount().getJid().getLocalpart();
+		} else {
+			account = contact.getAccount().getJid().toBareJid().toString();
+		}
+		accountJidTv.setText(getString(R.string.using_account, account));
 		badge.setImageBitmap(avatarService().get(contact, getPixel(Config.AVATAR_SIZE)));
 		badge.setOnClickListener(this.onBadgeClick);
 
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index e9b361f4f..fee2df162 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
@@ -413,6 +413,7 @@ public class ConversationActivity extends XmppActivity
 					menuContactDetails.setVisible(false);
 					menuAttach.setVisible(getSelectedConversation().getAccount().httpUploadAvailable());
 					menuInviteContact.setVisible(getSelectedConversation().getMucOptions().canInvite());
+					menuSecure.setVisible(!Config.HIDE_PGP_IN_UI); //if pgp is hidden conferences have no choice of encryption
 				} else {
 					menuMucDetails.setVisible(false);
 				}
@@ -801,9 +802,10 @@ public class ConversationActivity extends XmppActivity
 			MenuItem none = popup.getMenu().findItem(R.id.encryption_choice_none);
 			MenuItem pgp = popup.getMenu().findItem(R.id.encryption_choice_pgp);
 			MenuItem axolotl = popup.getMenu().findItem(R.id.encryption_choice_axolotl);
+			pgp.setVisible(!Config.HIDE_PGP_IN_UI);
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
-				otr.setEnabled(false);
-				axolotl.setEnabled(false);
+				otr.setVisible(false);
+				axolotl.setVisible(false);
 			} else if (!conversation.getAccount().getAxolotlService().isContactAxolotlCapable(conversation.getContact())) {
 				axolotl.setEnabled(false);
 			}
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index cd4f48d0f..7536ea753 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -63,6 +63,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	private TextView mSessionEst;
 	private TextView mOtrFingerprint;
 	private TextView mAxolotlFingerprint;
+	private TextView mAccountJidLabel;
 	private ImageView mAvatar;
 	private RelativeLayout mOtrFingerprintBox;
 	private RelativeLayout mAxolotlFingerprintBox;
@@ -87,17 +88,34 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				xmppConnectionService.updateAccount(mAccount);
 				return;
 			}
-			final boolean registerNewAccount = mRegisterNew.isChecked();
+			final boolean registerNewAccount = mRegisterNew.isChecked() && !Config.DISALLOW_REGISTRATION_IN_UI;
+			if (Config.DOMAIN_LOCK != null && mAccountJid.getText().toString().contains("@")) {
+				mAccountJid.setError(getString(R.string.invalid_username));
+				mAccountJid.requestFocus();
+				return;
+			}
 			final Jid jid;
 			try {
-				jid = Jid.fromString(mAccountJid.getText().toString());
+				if (Config.DOMAIN_LOCK != null) {
+					jid = Jid.fromParts(mAccountJid.getText().toString(),Config.DOMAIN_LOCK,null);
+				} else {
+					jid = Jid.fromString(mAccountJid.getText().toString());
+				}
 			} catch (final InvalidJidException e) {
-				mAccountJid.setError(getString(R.string.invalid_jid));
+				if (Config.DOMAIN_LOCK != null) {
+					mAccountJid.setError(getString(R.string.invalid_username));
+				} else {
+					mAccountJid.setError(getString(R.string.invalid_jid));
+				}
 				mAccountJid.requestFocus();
 				return;
 			}
 			if (jid.isDomainJid()) {
-				mAccountJid.setError(getString(R.string.invalid_jid));
+				if (Config.DOMAIN_LOCK != null) {
+					mAccountJid.setError(getString(R.string.invalid_username));
+				} else {
+					mAccountJid.setError(getString(R.string.invalid_jid));
+				}
 				mAccountJid.requestFocus();
 				return;
 			}
@@ -123,13 +141,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				mAccount.setOption(Account.OPTION_REGISTER, registerNewAccount);
 				xmppConnectionService.updateAccount(mAccount);
 			} else {
-				try {
-					if (xmppConnectionService.findAccountByJid(Jid.fromString(mAccountJid.getText().toString())) != null) {
-						mAccountJid.setError(getString(R.string.account_already_exists));
-						mAccountJid.requestFocus();
-						return;
-					}
-				} catch (final InvalidJidException e) {
+				if (xmppConnectionService.findAccountByJid(jid) != null) {
+					mAccountJid.setError(getString(R.string.account_already_exists));
+					mAccountJid.requestFocus();
 					return;
 				}
 				mAccount = new Account(jid.toBareJid(), password);
@@ -285,10 +299,17 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 	}
 
 	protected boolean accountInfoEdited() {
-		return this.mAccount != null && (!this.mAccount.getJid().toBareJid().toString().equals(
-					this.mAccountJid.getText().toString())
-			|| !this.mAccount.getPassword().equals(
-						this.mPassword.getText().toString()));
+		if (this.mAccount == null) {
+			return false;
+		}
+		final String unmodified;
+		if (Config.DOMAIN_LOCK != null) {
+			unmodified = this.mAccount.getJid().getLocalpart();
+		} else {
+			unmodified = this.mAccount.getJid().toBareJid().toString();
+		}
+		return !unmodified.equals(this.mAccountJid.getText().toString()) ||
+				!this.mAccount.getPassword().equals(this.mPassword.getText().toString());
 	}
 
 	@Override
@@ -306,6 +327,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		setContentView(R.layout.activity_edit_account);
 		this.mAccountJid = (AutoCompleteTextView) findViewById(R.id.account_jid);
 		this.mAccountJid.addTextChangedListener(this.mTextWatcher);
+		this.mAccountJidLabel = (TextView) findViewById(R.id.account_jid_label);
+		if (Config.DOMAIN_LOCK != null) {
+			this.mAccountJidLabel.setText(R.string.username);
+			this.mAccountJid.setHint(R.string.username_hint);
+		}
 		this.mPassword = (EditText) findViewById(R.id.account_password);
 		this.mPassword.addTextChangedListener(this.mTextWatcher);
 		this.mPasswordConfirm = (EditText) findViewById(R.id.account_password_confirm);
@@ -348,6 +374,9 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			}
 		};
 		this.mRegisterNew.setOnCheckedChangeListener(OnCheckedShowConfirmPassword);
+		if (Config.DISALLOW_REGISTRATION_IN_UI) {
+			this.mRegisterNew.setVisibility(View.GONE);
+		}
 	}
 
 	@Override
@@ -406,9 +435,6 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	@Override
 	protected void onBackendConnected() {
-		final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
-				android.R.layout.simple_list_item_1,
-				xmppConnectionService.getKnownHosts());
 		if (this.jidToEdit != null) {
 			this.mAccount = xmppConnectionService.findAccountByJid(jidToEdit);
 			updateAccountInformation(true);
@@ -421,7 +447,12 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mCancelButton.setEnabled(false);
 			this.mCancelButton.setTextColor(getSecondaryTextColor());
 		}
-		this.mAccountJid.setAdapter(mKnownHostsAdapter);
+		if (Config.DOMAIN_LOCK == null) {
+			final KnownHostsAdapter mKnownHostsAdapter = new KnownHostsAdapter(this,
+					android.R.layout.simple_list_item_1,
+					xmppConnectionService.getKnownHosts());
+			this.mAccountJid.setAdapter(mKnownHostsAdapter);
+		}
 		updateSaveButton();
 	}
 
@@ -451,7 +482,11 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	private void updateAccountInformation(boolean init) {
 		if (init) {
-			this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
+			if (Config.DOMAIN_LOCK != null) {
+				this.mAccountJid.setText(this.mAccount.getJid().getLocalpart());
+			} else {
+				this.mAccountJid.setText(this.mAccount.getJid().toBareJid().toString());
+			}
 			this.mPassword.setText(this.mAccount.getPassword());
 		}
 		if (this.jidToEdit != null) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
index e1189e7a3..5b9b73550 100644
--- a/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
@@ -18,6 +18,7 @@ import android.widget.ListView;
 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.services.XmppConnectionService.OnAccountUpdate;
@@ -81,6 +82,7 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
 			menu.findItem(R.id.mgmt_account_publish_avatar).setVisible(false);
 		} else {
 			menu.findItem(R.id.mgmt_account_enable).setVisible(false);
+			menu.findItem(R.id.mgmt_account_announce_pgp).setVisible(!Config.HIDE_PGP_IN_UI);
 		}
 		menu.setHeaderTitle(this.selectedAccount.getJid().toBareJid().toString());
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 2f6d765de..e01490f90 100644
--- a/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
@@ -13,6 +13,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.utils.PhoneHelper;
@@ -192,7 +193,13 @@ public class PublishProfilePictureActivity extends XmppActivity {
 				} else {
 					loadImageIntoPreview(avatarUri);
 				}
-				this.accountTextView.setText(this.account.getJid().toBareJid().toString());
+				String account;
+				if (Config.DOMAIN_LOCK != null) {
+					account = this.account.getJid().getLocalpart();
+				} else {
+					account = this.account.getJid().toBareJid().toString();
+				}
+				this.accountTextView.setText(account);
 			}
 		}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 68e77af49..74621fc4c 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -289,7 +289,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 
 	protected void toggleContactBlock() {
 		final int position = contact_context_id;
-		BlockContactDialog.show(this, xmppConnectionService, (Contact)contacts.get(position));
+		BlockContactDialog.show(this, xmppConnectionService, (Contact) contacts.get(position));
 	}
 
 	protected void deleteContact() {
@@ -299,7 +299,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		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
@@ -319,7 +319,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
@@ -368,7 +368,11 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 						}
 						final Jid accountJid;
 						try {
-							accountJid = Jid.fromString((String) spinner.getSelectedItem());
+							if (Config.DOMAIN_LOCK != null) {
+								accountJid = Jid.fromParts((String) spinner.getSelectedItem(),Config.DOMAIN_LOCK,null);
+							} else {
+								accountJid = Jid.fromString((String) spinner.getSelectedItem());
+							}
 						} catch (final InvalidJidException e) {
 							return;
 						}
@@ -379,8 +383,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 							jid.setError(getString(R.string.invalid_jid));
 							return;
 						}
-						final Account account = xmppConnectionService
-							.findAccountByJid(accountJid);
+						final Account account = xmppConnectionService.findAccountByJid(accountJid);
 						if (account == null) {
 							dialog.dismiss();
 							return;
@@ -428,7 +431,11 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 						}
 						final Jid accountJid;
 						try {
-							accountJid = Jid.fromString((String) spinner.getSelectedItem());
+							if (Config.DOMAIN_LOCK != null) {
+								accountJid = Jid.fromParts((String) spinner.getSelectedItem(),Config.DOMAIN_LOCK,null);
+							} else {
+								accountJid = Jid.fromString((String) spinner.getSelectedItem());
+							}
 						} catch (final InvalidJidException e) {
 							return;
 						}
@@ -576,7 +583,11 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 		this.mActivatedAccounts.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
 			if (account.getStatus() != Account.State.DISABLED) {
-				this.mActivatedAccounts.add(account.getJid().toBareJid().toString());
+				if (Config.DOMAIN_LOCK != null) {
+					this.mActivatedAccounts.add(account.getJid().getLocalpart());
+				} else {
+					this.mActivatedAccounts.add(account.getJid().toBareJid().toString());
+				}
 			}
 		}
 		final Intent intent = getIntent();
diff --git a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
index 37ddf5906..c55518579 100644
--- a/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java
@@ -124,9 +124,7 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 							ownKeysToTrust.put(identityKey, isChecked);
-							refreshUi();
-							xmppConnectionService.updateAccountUi();
-							xmppConnectionService.updateConversationUi();
+							// own fingerprints have no impact on locked status.
 						}
 					},
 					null
@@ -140,9 +138,7 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 						@Override
 						public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
 							foreignKeysToTrust.put(identityKey, isChecked);
-							refreshUi();
-							xmppConnectionService.updateAccountUi();
-							xmppConnectionService.updateConversationUi();
+							lockOrUnlockAsNeeded();
 						}
 					},
 					null
@@ -161,11 +157,7 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 			setFetching();
 			lock();
 		} else {
-			if (!hasOtherTrustedKeys && !foreignKeysToTrust.values().contains(true)){
-				lock();
-			} else {
-				unlock();
-			}
+			lockOrUnlockAsNeeded();
 			setDone();
 		}
 	}
@@ -245,6 +237,14 @@ public class TrustKeysActivity extends XmppActivity implements OnKeyStatusUpdate
 		mSaveButton.setTextColor(getSecondaryTextColor());
 	}
 
+	private void lockOrUnlockAsNeeded() {
+		if (!hasOtherTrustedKeys && !foreignKeysToTrust.values().contains(true)){
+			lock();
+		} else {
+			unlock();
+		}
+	}
+
 	private void setDone() {
 		mSaveButton.setText(getString(R.string.done));
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 561f02bdb..c1b9cbdf6 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -11,6 +11,7 @@ import android.widget.TextView;
 
 import java.util.List;
 
+import eu.siacs.conversations.Config;
 import eu.siacs.conversations.R;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.ui.ManageAccountActivity;
@@ -35,7 +36,11 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 			view = inflater.inflate(R.layout.account_row, parent, false);
 		}
 		TextView jid = (TextView) view.findViewById(R.id.account_jid);
-		jid.setText(account.getJid().toBareJid().toString());
+		if (Config.DOMAIN_LOCK != null) {
+			jid.setText(account.getJid().getLocalpart());
+		} else {
+			jid.setText(account.getJid().toBareJid().toString());
+		}
 		TextView statusView = (TextView) view.findViewById(R.id.account_status);
 		ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
 		imageView.setImageBitmap(activity.avatarService().get(account, activity.getPixel(56)));
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index c41c5174e..bf89ba816 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -34,6 +34,7 @@ import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -94,7 +95,7 @@ public class XmppConnection implements Runnable {
 
 	private String streamId = null;
 	private int smVersion = 3;
-	private final SparseArray<String> messageReceipts = new SparseArray<>();
+	private final SparseArray<String> mStanzaReceipts = new SparseArray<>();
 
 	private int stanzasReceived = 0;
 	private int stanzasSent = 0;
@@ -340,23 +341,24 @@ public class XmppConnection implements Runnable {
 												+ ": session resumed with lost packages");
 										stanzasSent = serverCount;
 									} else {
-										Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
-												+ ": session resumed");
+										Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": session resumed");
 									}
-									if (acknowledgedListener != null) {
-										for (int i = 0; i < messageReceipts.size(); ++i) {
-											if (serverCount >= messageReceipts.keyAt(i)) {
-												acknowledgedListener.onMessageAcknowledged(
-														account, messageReceipts.valueAt(i));
-											}
+									acknowledgeStanzaUpTo(serverCount);
+									ArrayList<IqPacket> failedIqPackets = new ArrayList<>();
+									for(int i = 0; i < this.mStanzaReceipts.size(); ++i) {
+										String id = mStanzaReceipts.valueAt(i);
+										Pair<IqPacket,OnIqPacketReceived> pair = id == null ? null : this.packetCallbacks.get(id);
+										if (pair != null) {
+											failedIqPackets.add(pair.first);
 										}
 									}
-									messageReceipts.clear();
+									mStanzaReceipts.clear();
+									Log.d(Config.LOGTAG,"resending "+failedIqPackets.size()+" iq stanza");
+									for(IqPacket packet : failedIqPackets) {
+										sendUnmodifiedIqPacket(packet,null);
+									}
 								} catch (final NumberFormatException ignored) {
 								}
-								sendServiceDiscoveryInfo(account.getServer());
-								sendServiceDiscoveryInfo(account.getJid().toBareJid());
-								sendServiceDiscoveryItems(account.getServer());
 								sendInitialPing();
 							} else if (nextTag.isStart("r")) {
 								tagReader.readElement(nextTag);
@@ -370,17 +372,7 @@ public class XmppConnection implements Runnable {
 								lastPacketReceived = SystemClock.elapsedRealtime();
 								try {
 									final int serverSequence = Integer.parseInt(ack.getAttribute("h"));
-									if (Config.EXTENDED_SM_LOGGING) {
-										Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + serverSequence);
-									}
-									final String msgId = this.messageReceipts.get(serverSequence);
-									if (msgId != null) {
-										if (this.acknowledgedListener != null) {
-											this.acknowledgedListener.onMessageAcknowledged(
-													account, msgId);
-										}
-										this.messageReceipts.remove(serverSequence);
-									}
+									acknowledgeStanzaUpTo(serverSequence);
 								} catch (NumberFormatException e) {
 									Log.d(Config.LOGTAG,account.getJid().toBareJid()+": server send ack without sequence number");
 								}
@@ -408,6 +400,22 @@ public class XmppConnection implements Runnable {
 						}
 	}
 
+	private void acknowledgeStanzaUpTo(int serverCount) {
+		for (int i = 0; i < mStanzaReceipts.size(); ++i) {
+			if (serverCount >= mStanzaReceipts.keyAt(i)) {
+				if (Config.EXTENDED_SM_LOGGING) {
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": server acknowledged stanza #" + mStanzaReceipts.keyAt(i));
+				}
+				String id = mStanzaReceipts.valueAt(i);
+				if (acknowledgedListener != null) {
+					acknowledgedListener.onMessageAcknowledged(account, id);
+				}
+				mStanzaReceipts.removeAt(i);
+				i--;
+			}
+		}
+	}
+
 	private void sendInitialPing() {
 		Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": sending intial ping");
 		final IqPacket iq = new IqPacket(IqPacket.TYPE.GET);
@@ -709,6 +717,7 @@ public class XmppConnection implements Runnable {
 			} catch (final InterruptedException ignored) {
 			}
 		}
+		clearIqCallbacks();
 		final IqPacket iq = new IqPacket(IqPacket.TYPE.SET);
 		iq.addChild("bind", "urn:ietf:params:xml:ns:xmpp-bind")
 				.addChild("resource").setContent(account.getResource());
@@ -739,9 +748,20 @@ public class XmppConnection implements Runnable {
 		});
 	}
 
+	private void clearIqCallbacks() {
+		Log.d(Config.LOGTAG,account.getJid().toBareJid()+": clearing iq iq callbacks");
+		final IqPacket failurePacket = new IqPacket(IqPacket.TYPE.ERROR);
+		Iterator<Entry<String, Pair<IqPacket, OnIqPacketReceived>>> iterator = this.packetCallbacks.entrySet().iterator();
+		while(iterator.hasNext()) {
+			Entry<String, Pair<IqPacket, OnIqPacketReceived>> entry = iterator.next();
+			entry.getValue().second.onIqPacketReceived(account,failurePacket);
+			iterator.remove();
+		}
+	}
+
 	private void sendStartSession() {
 		final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET);
-		startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session");
+		startSession.addChild("session", "urn:ietf:params:xml:ns:xmpp-session");
 		this.sendUnmodifiedIqPacket(startSession, new OnIqPacketReceived() {
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket packet) {
@@ -765,7 +785,7 @@ public class XmppConnection implements Runnable {
 			final EnablePacket enable = new EnablePacket(smVersion);
 			tagWriter.writeStanzaAsync(enable);
 			stanzasSent = 0;
-			messageReceipts.clear();
+			mStanzaReceipts.clear();
 		}
 		features.carbonsEnabled = false;
 		features.blockListRequested = false;
@@ -897,7 +917,7 @@ public class XmppConnection implements Runnable {
 
 	public void sendIqPacket(final IqPacket packet, final OnIqPacketReceived callback) {
 		packet.setFrom(account.getJid());
-		this.sendUnmodifiedIqPacket(packet,callback);
+		this.sendUnmodifiedIqPacket(packet, callback);
 
 	}
 
@@ -907,9 +927,6 @@ public class XmppConnection implements Runnable {
 			packet.setAttribute("id", id);
 		}
 		if (callback != null) {
-			if (packet.getId() == null) {
-				packet.setId(nextRandomId());
-			}
 			packetCallbacks.put(packet.getId(), new Pair<>(packet, callback));
 		}
 		this.sendPacket(packet);
@@ -934,11 +951,11 @@ public class XmppConnection implements Runnable {
 			++stanzasSent;
 		}
 		tagWriter.writeStanzaAsync(packet);
-		if (packet instanceof MessagePacket && packet.getId() != null && getFeatures().sm()) {
+		if ((packet instanceof MessagePacket || packet instanceof IqPacket) && packet.getId() != null && this.streamId != null) {
 			if (Config.EXTENDED_SM_LOGGING) {
-				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for message stanza #" + stanzasSent);
+				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": requesting ack for stanza #" + stanzasSent);
 			}
-			this.messageReceipts.put(stanzasSent, packet.getId());
+			this.mStanzaReceipts.put(stanzasSent, packet.getId());
 			tagWriter.writeStanzaAsync(new RequestPacket(this.smVersion));
 		}
 	}
@@ -1007,7 +1024,7 @@ public class XmppConnection implements Runnable {
 					if (tagWriter.isActive()) {
 						tagWriter.finish();
 						try {
-							while (!tagWriter.finished()) {
+							while (!tagWriter.finished() && socket.isConnected()) {
 								Log.d(Config.LOGTAG, "not yet finished");
 								Thread.sleep(100);
 							}
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 8ffb79767..c38881e41 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -12,475 +12,501 @@
         android:layout_above="@+id/button_bar"
         android:layout_alignParentTop="true" >
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <RelativeLayout
+            android:id="@+id/editor"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
+            android:background="@drawable/infocard_border"
+            android:orientation="vertical"
+            android:padding="@dimen/infocard_padding">
+
+        <com.makeramen.roundedimageview.RoundedImageView
+            android:id="@+id/avater"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_alignParentTop="true"
+            android:layout_marginRight="16dp"
+            android:layout_centerHorizontal="true"
+            android:contentDescription="@string/account_image_description"
+            app:riv_corner_radius="2dp"/>
+
         <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:layout_toRightOf="@+id/avater">
+        <TextView
+            android:id="@+id/account_jid_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_settings_jabber_id"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <AutoCompleteTextView
+            android:id="@+id/account_jid"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical" >
-
-            <RelativeLayout
-                android:id="@+id/editor"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding">
-
-                <com.makeramen.roundedimageview.RoundedImageView
-                    android:id="@+id/avater"
-                    android:layout_width="300dp"
-                    android:layout_height="300dp"
-                    android:layout_alignParentTop="true"
-                    android:layout_marginRight="16dp"
-                    android:layout_centerHorizontal="true"
-                    android:contentDescription="@string/account_image_description"
-                    app:riv_corner_radius="2dp"/>
-
-                <LinearLayout
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:layout_below="@+id/avater"
-                    android:layout_alignParentLeft="true"
-                    android:layout_alignParentStart="true"
-                    android:layout_marginTop="16dp">
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_jabber_id"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <AutoCompleteTextView
-                        android:id="@+id/account_jid"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/account_settings_example_jabber_id"
-                        android:inputType="textEmailAddress"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/account_settings_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <EditText
-                        android:id="@+id/account_password"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:hint="@string/password"
-                        android:inputType="textPassword"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <CheckBox
-                        android:id="@+id/account_register_new"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/register_account"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody" />
-
-                    <TextView
-                        android:id="@+id/account_confirm_password_desc"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/account_settings_confirm_password"
-                        android:textColor="@color/black87"
-                        android:textSize="?attr/TextSizeBody"
-                        android:visibility="gone" />
-
-                    <EditText
-                        android:id="@+id/account_password_confirm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:hint="@string/confirm_password"
-                        android:inputType="textPassword"
-                        android:visibility="gone"
-                        android:textColor="@color/black87"
-                        android:textColorHint="@color/black54"
-                        android:textSize="?attr/TextSizeBody" />
-                </LinearLayout>
-            </RelativeLayout>
-
-            <LinearLayout
-                android:id="@+id/stats"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone" >
-
-                <TableLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:stretchColumns="1" >
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        tools:ignore="UselessParent">
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_session_established"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/session_est"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                </TableLayout>
-                <TableLayout
-                    android:id="@+id/server_info_more"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:stretchColumns="1"
-                    android:visibility="gone" >
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_pep"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_pep"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_blocking"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_blocking"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_stream_management"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_sm"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_roster_version"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_roster_version"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_carbon_messages"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_carbons"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_mam"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_mam"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-
-                    <TableRow
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content" >
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="@string/server_info_csi"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody" />
-
-                        <TextView
-                            android:id="@+id/server_info_csi"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="right"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            tools:ignore="RtlHardcoded"/>
-                    </TableRow>
-                </TableLayout>
-
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:id="@+id/otr_fingerprint_box"
-                    android:layout_marginTop="32dp">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/otr_fingerprint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace"
-                            android:fontFamily="monospace"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black54"
-                            android:textSize="?attr/TextSizeInfo"
-                            android:text="@string/otr_fingerprint"/>
-                    </LinearLayout>
-
-                    <ImageButton
-                        android:id="@+id/action_copy_to_clipboard"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentRight="true"
-                        android:layout_centerVertical="true"
-                        android:background="?android:selectableItemBackground"
-                        android:padding="@dimen/image_button_padding"
-                        android:src="?attr/icon_copy"
-                        android:visibility="visible"
-                        android:contentDescription="@string/copy_otr_clipboard_description"/>
-                </RelativeLayout>
-                <RelativeLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:id="@+id/axolotl_fingerprint_box"
-                    android:layout_marginTop="32dp">
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toLeftOf="@+id/axolotl_actions"
-                        android:orientation="vertical">
-
-                        <TextView
-                            android:id="@+id/axolotl_fingerprint"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black87"
-                            android:textSize="?attr/TextSizeBody"
-                            android:typeface="monospace"
-                            android:fontFamily="monospace"/>
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@color/black54"
-                            android:textSize="?attr/TextSizeInfo"
-                            android:text="@string/this_device_axolotl_fingerprint"/>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/axolotl_actions"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentRight="true"
-                        android:orientation="vertical">
-
-                        <ImageButton
-                            android:id="@+id/action_copy_axolotl_to_clipboard"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="?android:selectableItemBackground"
-                            android:padding="@dimen/image_button_padding"
-                            android:src="?attr/icon_copy"
-                            android:visibility="visible"
-                            android:contentDescription="@string/copy_axolotl_clipboard_description"/>
-                        <ImageButton
-                            android:id="@+id/action_regenerate_axolotl_key"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="?android:selectableItemBackground"
-                            android:padding="@dimen/image_button_padding"
-                            android:src="?attr/icon_refresh"
-                            android:visibility="gone"
-                            android:contentDescription="@string/regenerate_axolotl_key"/>
-
-                    </LinearLayout>
-                </RelativeLayout>
-            </LinearLayout>
-            <LinearLayout
-                android:id="@+id/other_device_keys_card"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/activity_horizontal_margin"
-                android:layout_marginRight="@dimen/activity_horizontal_margin"
-                android:layout_marginTop="@dimen/activity_vertical_margin"
-                android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@drawable/infocard_border"
-                android:orientation="vertical"
-                android:padding="@dimen/infocard_padding"
-                android:visibility="gone">
-
-                <TextView
-                    android:id="@+id/other_device_keys_title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textColor="@color/black87"
-                    android:textSize="?attr/TextSizeHeadline"
-                    android:textStyle="bold"
-                    android:text="@string/other_devices"/>
-
-                <LinearLayout
-                    android:id="@+id/other_device_keys"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="?android:dividerHorizontal"
-                    android:orientation="vertical"
-                    android:showDividers="middle" >
-                </LinearLayout>
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
+            android:hint="@string/account_settings_example_jabber_id"
+            android:inputType="textEmailAddress"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/account_settings_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <AutoCompleteTextView
+            android:id="@+id/account_jid"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/account_settings_example_jabber_id"
+            android:inputType="textEmailAddress"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/account_settings_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <EditText
+            android:id="@+id/account_password"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/password"
+            android:inputType="textPassword"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+
+        <CheckBox
+            android:id="@+id/account_register_new"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/register_account"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/account_confirm_password_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/account_settings_confirm_password"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/account_password_confirm"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/confirm_password"
+            android:inputType="textPassword"
+            android:visibility="gone"
+            android:textColor="@color/black87"
+            android:textColorHint="@color/black54"
+            android:textSize="?attr/TextSizeBody" />
+    </LinearLayout>
+</RelativeLayout>
+
+<LinearLayout
+android:id="@+id/stats"
+android:layout_width="fill_parent"
+android:layout_height="fill_parent"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin"
+android:layout_marginTop="@dimen/activity_vertical_margin"
+android:layout_marginBottom="@dimen/activity_vertical_margin"
+android:background="@drawable/infocard_border"
+android:orientation="vertical"
+android:padding="@dimen/infocard_padding"
+android:visibility="gone" >
+
+<TableLayout
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1" >
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UselessParent">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_session_established"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/session_est"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+</TableLayout>
+<TableLayout
+    android:id="@+id/server_info_more"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1"
+    android:visibility="gone" >
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_pep"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_pep"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_blocking"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_blocking"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_stream_management"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_sm"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_roster_version"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_roster_version"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_carbon_messages"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_carbons"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_mam"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_mam"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+
+    <TableRow
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content" >
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/server_info_csi"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody" />
+
+        <TextView
+            android:id="@+id/server_info_csi"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            tools:ignore="RtlHardcoded"/>
+    </TableRow>
+</TableLayout>
+
+<RelativeLayout
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:id="@+id/otr_fingerprint_box"
+    android:layout_marginTop="32dp">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_toLeftOf="@+id/action_copy_to_clipboard"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/otr_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"
+            android:text="@string/otr_fingerprint"/>
+    </LinearLayout>
+
+    <ImageButton
+        android:id="@+id/action_copy_to_clipboard"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:background="?android:selectableItemBackground"
+        android:padding="@dimen/image_button_padding"
+        android:src="?attr/icon_copy"
+        android:visibility="visible"
+        android:contentDescription="@string/copy_otr_clipboard_description"/>
+</RelativeLayout>
+<RelativeLayout
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent"
+    android:id="@+id/axolotl_fingerprint_box"
+    android:layout_marginTop="32dp">
 
     <LinearLayout
-        android:id="@+id/button_bar"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentStart="true"
-        android:layout_alignParentEnd="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentRight="true" >
-
-        <Button
-            android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/cancel"
-            android:textColor="@color/black87" />
-
-        <View
-            android:layout_width="1dp"
-            android:layout_height="fill_parent"
-            android:layout_marginBottom="7dp"
-            android:layout_marginTop="7dp"
-            android:background="@color/black12" />
-
-        <Button
-            android:id="@+id/save_button"
-            style="?android:attr/borderlessButtonStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:enabled="false"
-            android:text="@string/save"
-            android:textColor="@color/black54" />
+        android:layout_toLeftOf="@+id/axolotl_actions"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/axolotl_fingerprint"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black87"
+            android:textSize="?attr/TextSizeBody"
+            android:typeface="monospace"
+            android:fontFamily="monospace"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="@color/black54"
+            android:textSize="?attr/TextSizeInfo"
+            android:text="@string/this_device_axolotl_fingerprint"/>
     </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/axolotl_actions"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:orientation="vertical">
+
+        <ImageButton
+            android:id="@+id/action_copy_axolotl_to_clipboard"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:padding="@dimen/image_button_padding"
+            android:src="?attr/icon_copy"
+            android:visibility="visible"
+            android:contentDescription="@string/copy_axolotl_clipboard_description"/>
+        <ImageButton
+            android:id="@+id/action_regenerate_axolotl_key"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:padding="@dimen/image_button_padding"
+            android:src="?attr/icon_refresh"
+            android:visibility="gone"
+            android:contentDescription="@string/regenerate_axolotl_key"/>
+
+    </LinearLayout>
+</RelativeLayout>
+</LinearLayout>
+<LinearLayout
+android:id="@+id/other_device_keys_card"
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_marginLeft="@dimen/activity_horizontal_margin"
+android:layout_marginRight="@dimen/activity_horizontal_margin"
+android:layout_marginTop="@dimen/activity_vertical_margin"
+android:layout_marginBottom="@dimen/activity_vertical_margin"
+android:background="@drawable/infocard_border"
+android:orientation="vertical"
+android:padding="@dimen/infocard_padding"
+android:visibility="gone">
+
+<TextView
+    android:id="@+id/other_device_keys_title"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:textColor="@color/black87"
+    android:textSize="?attr/TextSizeHeadline"
+    android:textStyle="bold"
+    android:text="@string/other_devices"/>
+
+<LinearLayout
+    android:id="@+id/other_device_keys"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:divider="?android:dividerHorizontal"
+    android:orientation="vertical"
+    android:showDividers="middle" >
+</LinearLayout>
+</LinearLayout>
+    </LinearLayout>
+    </ScrollView>
+
+<LinearLayout
+android:id="@+id/button_bar"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:layout_alignParentBottom="true"
+android:layout_alignParentStart="true"
+android:layout_alignParentEnd="true"
+android:layout_alignParentLeft="true"
+android:layout_alignParentRight="true" >
+
+<Button
+    android:id="@+id/cancel_button"
+    style="?android:attr/borderlessButtonStyle"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:text="@string/cancel"
+    android:textColor="@color/black87" />
+
+<View
+    android:layout_width="1dp"
+    android:layout_height="fill_parent"
+    android:layout_marginBottom="7dp"
+    android:layout_marginTop="7dp"
+    android:background="@color/black12" />
+
+<Button
+    android:id="@+id/save_button"
+    style="?android:attr/borderlessButtonStyle"
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_weight="1"
+    android:enabled="false"
+    android:text="@string/save"
+    android:textColor="@color/black54" />
+</LinearLayout>
+
+    </RelativeLayout>
diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 83f622668..07cca2c1e 100644
--- a/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
@@ -57,6 +57,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/white"
                 android:textColor="@color/white"
+                android:textColorHighlight="@color/grey800"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 139dec0e8..d76117d89 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -57,6 +57,7 @@
                 android:autoLink="web"
                 android:textColorLink="@color/black87"
                 android:textColor="@color/black87"
+                android:textColorHighlight="@color/grey500"
                 android:textSize="?attr/TextSizeBody" />
 
             <Button
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 2789262e3..05c273054 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -449,4 +449,7 @@
   <string name="file_not_found_on_remote_host">Datei auf Server nicht gefunden</string>
   <string name="search_for_contacts_or_groups">Nach Kontakten oder Konferenzen suchen</string>
   <string name="is_typing">schreibt...</string>
+  <string name="username">Benutzername</string>
+	<string name="username_hint">Benutzername</string>
+	<string name="invalid_username">Das ist kein gültiger Benutzername</string>
 </resources>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index a5d7eea30..c2a3ad60c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -11,6 +11,7 @@
 	<color name="white70">#b2ffffff</color>
 	<color name="grey50">#fffafafa</color>
 	<color name="grey200">#ffeeeeee</color>
+	<color name="grey500">#ff9e9e9e</color>
 	<color name="grey800">#ff424242</color>
 	<color name="red500">#fff44336</color>
 	<color name="red800">#ffc62828</color>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4253c7a24..0c7557e4f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -500,4 +500,7 @@
 	<string name="send_private_message">Send private message</string>
 	<string name="user_has_left_conference">%s has left the conference!</string>
 	<string name="is_typing">is typing...</string>
+	<string name="username">Username</string>
+	<string name="username_hint">Username</string>
+	<string name="invalid_username">This is not a valid username</string>
 </resources>