diff --git a/res/layout/edit_account_dialog.xml b/res/layout/edit_account_dialog.xml
deleted file mode 100644
index 3b2ee981..00000000
--- a/res/layout/edit_account_dialog.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp">
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="14sp"
-        android:text="@string/account_settings_jabber_id" />
-
-
-    
-   <AutoCompleteTextView
-        android:id="@+id/account_jid"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="textEmailAddress"
-        android:hint="@string/account_settings_example_jabber_id" />
-
-    
-       
-      <TextView
-        android:paddingTop="8dp"
-        android:id="@+id/textView1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/account_settings_password"
-        android:textSize="14sp"/>
-
-    <EditText
-        android:id="@+id/account_password"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="textPassword"
-        android:hint="@string/password"
-        android:fontFamily="sans-serif" />
-
-    <CheckBox
-        android:id="@+id/edit_account_register_new"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/register_account"/>
-
-    
-        <TextView
-        android:paddingTop="8dp"
-        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:textSize="14sp"
-        android:visibility="gone"/>
-    
-    <EditText
-        android:id="@+id/account_password_confirm2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:ems="10"
-        android:inputType="textPassword"
-        android:hint="@string/confirm_password"
-        android:visibility="gone"
-        android:fontFamily="sans-serif" />
-
-</LinearLayout>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 08fef187..b9b2c532 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -75,9 +75,6 @@
     <string name="pref_conference_notifications_summary">Sempre notifica quan arriba un nou missatge de conferència en comptes de només quan està destacat</string>
     <string name="pref_notification_grace_period">Notificació del període d\'espera</string>
     <string name="pref_notification_grace_period_summary">Desactiva les notificacions durant un breu termini després de rebre una còpia de missatges carbon</string>
-    <string name="pref_ui_options">Opcions de UI</string>
-    <string name="pref_conference_name">Nom de la conferència</string>
-    <string name="pref_conference_name_summary">Utilitza l\'assumpte de la sala per identificar Conferències</string>
     <string name="pref_advanced_options">Opcions avançades</string>
     <string name="pref_never_send_crash">Mai enviïs informes d\'errors</string>
     <string name="pref_never_send_crash_summary">Enviant traces d\'execució ajudes al futur desenvolupament del Conversations.</string>    
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ae2cc378..4267f483 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -102,9 +102,6 @@
     <string name="pref_conference_notifications_summary">Benachrichtige mich bei jeder Konferenznachricht und nicht nur, wenn ich angesprochen werde.</string>
     <string name="pref_notification_grace_period">Gnadenfrist</string>
     <string name="pref_notification_grace_period_summary">Deaktiviere Benachrichtigungen für eine kurze Zeit nach Erhalt einer Nachricht, die von einem anderen deiner Clients kommt.</string>
-    <string name="pref_ui_options">Benutzeroberfläche</string>
-    <string name="pref_conference_name">Konferenzname</string>
-    <string name="pref_conference_name_summary">Benutze das Thema der Konferenz als Name in der Übersicht</string>
     <string name="pref_advanced_options">Erweiterte Optionen</string>
     <string name="pref_never_send_crash">Sende niemals Absturzberichte</string>
     <string name="pref_never_send_crash_summary">Wenn du Absturzberichte einschickst, hilfst du Conversations stetig zu verbessern</string>
@@ -172,7 +169,6 @@
     <string name="contact_status_offline">Offline</string>
     <string name="muc_details_conference">Konferenz</string>
     <string name="muc_details_other_members">Andere Mitglieder</string>
-    <string name="share_with_active_conversations">Aktive Gespräche</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatare)</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 0370d659..3779d002 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -102,9 +102,6 @@
     <string name="pref_conference_notifications_summary">Siempre notifica cuando llega un mensaje de conferencia y no solo cuando llega un mensaje destacado</string>
     <string name="pref_notification_grace_period">Notificaciones Carbons</string>
     <string name="pref_notification_grace_period_summary">Deshabilita las notificaciones durante un corto periodo de tiempo después de recibir la copia del mensaje carbon</string>
-    <string name="pref_ui_options">Opciones de interfaz</string>
-    <string name="pref_conference_name">Nombre de la conferencia</string>
-    <string name="pref_conference_name_summary">Usa el nombre de la sala para identificar Conferencias</string>
     <string name="pref_advanced_options">Opciones avanzadas</string>
     <string name="pref_never_send_crash">Nunca enviar informe de fallos</string>
     <string name="pref_never_send_crash_summary">Si envías registros de error ayudas al desarrollo de Conversations</string>
@@ -172,7 +169,6 @@
     <string name="contact_status_offline">Desconectado</string>
     <string name="muc_details_conference">Conferencia</string>
     <string name="muc_details_other_members">Otros Miembros</string>
-    <string name="share_with_active_conversations">Conversaciones Activas</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index fd3c2b16..8b5d9254 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -103,9 +103,6 @@
     <string name="pref_conference_notifications_summary">Beti jakinarazi konferentzia mezu berri bat heltzerakoan eta ez soilik nabarmentzerakoan</string>
     <string name="pref_notification_grace_period">Jakinarazpenen grazia epea</string>
     <string name="pref_notification_grace_period_summary">Jakinarazpenak denbora labur baterako ezgaitu ikatz-kopia bat jaso ondoren</string>
-    <string name="pref_ui_options">Erabiltzaile-interfazearen aukerak</string>
-    <string name="pref_conference_name">Konferentziaren izena</string>
-    <string name="pref_conference_name_summary">Erabili gelaren gaia konferentziak identifikatzeko</string>
     <string name="pref_advanced_options">Aukera aurreratuak</string>
     <string name="pref_never_send_crash">Gelditze txostenik ez bidali inoiz</string>
     <string name="pref_never_send_crash_summary">Akats harraskak bidaliz Conversationsen garapenean laguntzen duzu</string>
@@ -173,7 +170,6 @@
     <string name="contact_status_offline">lineaz kanpo</string>
     <string name="muc_details_conference">Konferentzia</string>
     <string name="muc_details_other_members">Beste kideak</string>
-    <string name="share_with_active_conversations">Elkarrizketa aktiboak</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Profileko argazkiak)</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 3f5f66b5..df9ab3f5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -102,9 +102,6 @@
     <string name="pref_conference_notifications_summary">Toujours notifier l\'arrivée d\'un message provenant d\'une conférence.</string>
     <string name="pref_notification_grace_period">Période sans notification</string>
     <string name="pref_notification_grace_period_summary">Désactiver momentanément les notifications après l\'arrivée d\'une copie carbone.</string>
-    <string name="pref_ui_options">Options d\'affichage</string>
-    <string name="pref_conference_name">Nom de la conférence</string>
-    <string name="pref_conference_name_summary">Identifier la conférence par son sujet</string>
     <string name="pref_advanced_options">Options avancées</string>
     <string name="pref_never_send_crash">Ne jamais envoyer de rapports d\'erreurs</string>
     <string name="pref_never_send_crash_summary">En envoyant des logs vous aidez au développement de Conversations.</string>
@@ -170,7 +167,6 @@
     <string name="contact_status_offline">Hors-ligne</string>
     <string name="muc_details_conference">Conférence</string>
     <string name="muc_details_other_members">Autres membres</string>
-    <string name="share_with_active_conversations">Conversations actives</string>
     <string name="server_info_carbon_messages">Copies carbone</string>
     <string name="server_info_stream_management">Gestion des flux</string>
     <string name="missing_public_keys">Aucune annonce de clef publique</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c15235dd..ae488614 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -79,9 +79,6 @@
     <string name="pref_conference_notifications_summary">Siempre notifica cuando chega unha mensaxe de conferencia e non solo cuando chega unha mensaxe destacada</string>
     <string name="pref_notification_grace_period">Notificacións Carbons</string>
     <string name="pref_notification_grace_period_summary">Deshabilita as notificacións durante un corto periodo de tiempo despois de recibir a copia da mensaxe carbón</string>
-    <string name="pref_ui_options">Opcións de interfaz</string>
-    <string name="pref_conference_name">Nome dea conferencia</string>
-    <string name="pref_conference_name_summary">Usa o nome da sala para identificar Conferencias</string>
     <string name="pref_advanced_options">Opcións avanzadas</string>
     <string name="pref_never_send_crash">Nunca enviar informe de erros</string>
     <string name="pref_never_send_crash_summary">Enviando volcados de pilas axudas al desenrolo de Conversations</string>
diff --git a/res/values-he/strings.xml b/res/values-he/strings.xml
index 071150b8..65684cd7 100644
--- a/res/values-he/strings.xml
+++ b/res/values-he/strings.xml
@@ -102,9 +102,6 @@
     <string name="pref_conference_notifications_summary">תמיד תודיע כאשר הודעת ועידה חדשה מגיעה במקום רק כאשר מודגשת</string>
     <string name="pref_notification_grace_period">משך ארכת התראה</string>
     <string name="pref_notification_grace_period_summary">נטרל התראות לזמן קצר לאחר שהודעת פחם התקבלה</string>
-    <string name="pref_ui_options">אפשרויות ממשק משתמש</string>
-    <string name="pref_conference_name">שם ועידה</string>
-    <string name="pref_conference_name_summary">השתמש בנושא חדר כדי לזהות ועידות</string>
     <string name="pref_advanced_options">אפשרויות מתקדמות</string>
     <string name="pref_never_send_crash">לעולם אל תשלח דיווחי קריסה</string>
     <string name="pref_never_send_crash_summary">על ידי שליחת עקבות מחסנית אתה עוזר להתקדמות הפיתוח של Conversations</string>
@@ -171,7 +168,6 @@
     <string name="contact_status_offline">לא מקוון</string>
     <string name="muc_details_conference">ועידה</string>
     <string name="muc_details_other_members">חברים אחרים</string>
-    <string name="share_with_active_conversations">דיונים פעילים</string>
     <string name="server_info_carbon_messages">הודעות פחם</string>
     <string name="server_info_stream_management">ניהול זרם</string>
     <string name="missing_public_keys">הכרזות מפתח פומבי חסרות</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 465b6d59..97b67224 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -98,9 +98,6 @@
     <string name="pref_conference_notifications_summary">Toon altijd notificaties als er nieuwe berichten arriveren in groepsconversaties in plaats van alleen bij highlighting</string>
     <string name="pref_notification_grace_period">Notificatie uitstel periode</string>
     <string name="pref_notification_grace_period_summary">Zet notificaties voor korte tijd uit als er een carbon copy wordt ontvangen</string>
-    <string name="pref_ui_options">UI Opties</string>
-    <string name="pref_conference_name">Groepsconversatie naam</string>
-    <string name="pref_conference_name_summary">Gebruik onderwerp van kamer om groepsconversaties te identificeren</string>
     <string name="pref_advanced_options">Geadvanceerde Opties</string>
     <string name="pref_never_send_crash">Verstuur nooit crash rapportages</string>
     <string name="pref_never_send_crash_summary">Door crash rapportages te versturen helpt U mee aan de ontwikkeling van Conversaties</string>
@@ -166,7 +163,6 @@
     <string name="contact_status_offline">offline</string>
     <string name="muc_details_conference">groepsconversatie</string>
     <string name="muc_details_other_members">Andere Leden</string>
-    <string name="share_with_active_conversations">Actieve Conversaties</string>
     <string name="server_info_carbon_messages">Carbon Berichten</string>
     <string name="server_info_stream_management">Stream Management</string>
     <string name="missing_public_keys">Ontbrekende publieke sleutel aankondigingen</string>
@@ -219,28 +215,18 @@
     <string name="additional_information">Extra informatie</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
     <string name="skip">Overslaan</string>
-    <string name="problem_connecting_to_account">Verbinden met account mislukt</string>
-    <string name="problem_connecting_to_accounts">Verbinden met meerdere accounts mislukt</string>
-    <string name="account_status_connecting">Verbinden\u2026</string>
-    <string name="account_status_no_internet">Geen verbinding met internet</string>
     <string name="connect">Verbinden</string>
     <string name="account_already_exists">Dit account bestaat al</string>
     <string name="private_message_to">naar %s</string>
     <string name="send_private_message_to">Verstuur privé bericht aan %s</string>
     <string name="touch_to_choose_picture">Klik op avatar om een afbeelding te selecteren uit de gallerij</string>
     <string name="mgmt_account_publish_avatar">Publiceer avatar</string>
-    <string name="publish_avatar_explanation">N.B.: Iedereen die uw aanwezigheid mag zien kan de afbeelding zien.</string>
     <string name="error_publish_avatar_server_reject">De server weigerde uw publicatie</string>
     <string name="error_publish_avatar_converting">Er ging iets mis bij het converteren van uw afbeelding</string>
     <string name="error_publish_avatar_no_server_support">Uw server ondersteunt de publicatie van avatars niet</string>
     <string name="publishing">Publiceren&#8230;</string>
-    <string name="error_publish_avatar_server_reject">De server weigerde uw publicatie</string>
-    <string name="send_private_message_to">Verstuur privé bericht aan %s</string>
     <string name="error_saving_avatar">Kon de avatar niet opslaan</string>
-    <string name="error_publish_avatar_no_server_support">Uw server ondersteunt het publiceren van avatars niet</string>
     <string name="server_info_session_established">Huidige sessie opgezet</string>
     <string name="or_long_press_for_default">(Of houdt lang ingedrukt om de oorspronkelijke terug te zetten)</string>
-    <string name="error_publish_avatar_converting">Er ging iets mis bij het converteren van uw afbeelding</string>
-    <string name="mgmt_account_publish_avatar">Publiceer avatar</string>
     <string name="server_info_available">beschikbaar</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 59359388..5009097a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -133,9 +133,6 @@
     <string name="pref_conference_notifications_summary">Всегда сообщать при получении нового сообщения в конференции</string>
     <string name="pref_notification_grace_period">Отсрочка уведомлений</string>
     <string name="pref_notification_grace_period_summary">Не использовать уведомления, если вы прочитали сообщение на другом устройстве</string>
-    <string name="pref_ui_options">Параметры интерфейса</string>
-    <string name="pref_conference_name">Название конференции</string>
-    <string name="pref_conference_name_summary">Использовать тему комнаты для идентификации конференции</string>
     <string name="pref_advanced_options">Дополнительные параметры</string>
     <string name="pref_never_send_crash">Отчеты об ошибках</string>
     <string name="pref_never_send_crash_summary">Отправляя отчеты об ошибках, вы помогаете исправить и улучшить Conversations, поддерживая дальнейшее развитие программы</string>
@@ -199,7 +196,6 @@
     <string name="contact_status_offline">не в сети</string>
     <string name="muc_details_conference">Конференция</string>
     <string name="muc_details_other_members">Другие участники</string>
-    <string name="share_with_active_conversations">Активные контакты</string>
     <string name="server_info_carbon_messages">Дублирование сообщений</string>
     <string name="server_info_stream_management">Управление потоками</string>
     <string name="missing_public_keys">Отсутствие анонсирования открытых ключей</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 24ca5c51..abd99dbc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -102,9 +102,6 @@
     <string name="pref_conference_notifications_summary">Notifiera alltid när nytt konferensmeddelande tagits emot istället för endast vid highlight</string>
     <string name="pref_notification_grace_period">Notifieringsfrist</string>
     <string name="pref_notification_grace_period_summary">Deaktivera notifieringar en kort stund efter att en carbon copy tagits emot</string>
-    <string name="pref_ui_options">UI inställningar</string>
-    <string name="pref_conference_name">Konferensnamn</string>
-    <string name="pref_conference_name_summary">Använd konferensens ämne för att identifera konferensen</string>
     <string name="pref_advanced_options">Avancerade inställningar</string>
     <string name="pref_never_send_crash">Skicka aldrig krasch-rapporter</string>
     <string name="pref_never_send_crash_summary">Genom att skicka in stack traces hjälper du utvecklarna av Conversations</string>
@@ -170,7 +167,6 @@
     <string name="contact_status_offline">offline</string>
     <string name="muc_details_conference">Konferens</string>
     <string name="muc_details_other_members">Andra medlemmar</string>
-    <string name="share_with_active_conversations">Aktiva konversationer</string>
     <string name="server_info_carbon_messages">Carbon Messages</string>
     <string name="server_info_stream_management">Stream Management</string>
     <string name="missing_public_keys">Annonsering om publik nyckel saknas</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0d5a75d5..2b14e74b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -103,9 +103,6 @@
     <string name="pref_conference_notifications_summary">Always notify when a new conference message arrives instead of only when highlighted</string>
     <string name="pref_notification_grace_period">Notification grace period</string>
     <string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
-    <string name="pref_ui_options">UI Options</string>
-    <string name="pref_conference_name">Conference name</string>
-    <string name="pref_conference_name_summary">Use room’s subject to identify Conferences</string>
     <string name="pref_advanced_options">Advanced Options</string>
     <string name="pref_never_send_crash">Never send crash reports</string>
     <string name="pref_never_send_crash_summary">By sending in stack traces you are helping the ongoing development of Conversations</string>
@@ -173,7 +170,6 @@
     <string name="contact_status_offline">offline</string>
     <string name="muc_details_conference">Conference</string>
     <string name="muc_details_other_members">Other Members</string>
-    <string name="share_with_active_conversations">Active Conversations</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
diff --git a/src/eu/siacs/conversations/crypto/OtrEngine.java b/src/eu/siacs/conversations/crypto/OtrEngine.java
index b23b31fe..07430140 100644
--- a/src/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/eu/siacs/conversations/crypto/OtrEngine.java
@@ -14,14 +14,12 @@ import java.security.spec.InvalidKeySpecException;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import android.content.Context;
 import android.util.Log;
 
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.persistance.DatabaseBackend;
 import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 
diff --git a/src/eu/siacs/conversations/ui/XmppActivity.java b/src/eu/siacs/conversations/ui/XmppActivity.java
index 6ff83357..a2567176 100644
--- a/src/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/eu/siacs/conversations/ui/XmppActivity.java
@@ -36,7 +36,6 @@ import android.os.IBinder;
 import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;