315 files changed, 6 insertions, 30 deletions

diff --git a/build.gradle b/build.gradle
index ab032571..2352b116 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,7 +51,11 @@ android {
 }
 
 dependencies {
-	// ToDo: Move libs here if possible (instead of including the jars)
-	"compile 'com.android.support:support-v13:19.1.0'"
+	compile project(':minidns')
+	compile project(':openpgpapilib')
+	compile project(':memorizingTrustManager')
+	compile 'com.android.support:support-v13:19.1.0'
+	// compile files('libs/bcprov-jdk15on-150.jar')
+	// compile files('libs/otr4j-0.10.jar')
 	compile fileTree(dir: 'libs', include: ['*.jar'])
 }
diff --git a/conversations/build.gradle b/conversations/build.gradle
deleted file mode 100644
index 08060e59..00000000
--- a/conversations/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 19
-    buildToolsVersion "20.0.0"
-
-    defaultConfig {
-        applicationId "eu.siacs.conversations"
-        minSdkVersion 14
-        targetSdkVersion 19
-    }
-
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-}
-
-dependencies {
-    compile project(':minidns')
-    compile project(':openpgpapilib')
-    compile project(':memorizingTrustManager')
-    compile files('libs/android-support-v13.jar')
-    compile files('libs/bcprov-jdk15on-150.jar')
-    compile files('libs/otr4j-0.10.jar')
-}
diff --git a/conversations/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7bde645f..7bde645f 100644
--- a/conversations/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
diff --git a/conversations/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 1725eca6..1725eca6 100644
--- a/conversations/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
index e0bd0e79..e0bd0e79 100644
--- a/conversations/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/OtrEngine.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
index 2696c7d2..2696c7d2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
+++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java
index 92b8a729..92b8a729 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java
+++ b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 80a9d62f..80a9d62f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index dd9e805c..dd9e805c 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java
index 60c31a42..60c31a42 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Contact.java
+++ b/src/main/java/eu/siacs/conversations/entities/Contact.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 9d4c36db..9d4c36db 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Downloadable.java b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
index 70516b20..70516b20 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Downloadable.java
+++ b/src/main/java/eu/siacs/conversations/entities/Downloadable.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
index 1605c75b..1605c75b 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
+++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java
index a1872d2f..a1872d2f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/ListItem.java
+++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index a390c7ca..a390c7ca 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index d7407cd5..d7407cd5 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java
index b5899847..b5899847 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Presences.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presences.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java
index 3267b15a..3267b15a 100644
--- a/conversations/src/main/java/eu/siacs/conversations/entities/Roster.java
+++ b/src/main/java/eu/siacs/conversations/entities/Roster.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index c96d116d..c96d116d 100644
--- a/conversations/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/IqGenerator.java b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
index d44bf0ca..d44bf0ca 100644
--- a/conversations/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/IqGenerator.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index dd833e56..dd833e56 100644
--- a/conversations/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
index d896dd00..d896dd00 100644
--- a/conversations/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnection.java b/src/main/java/eu/siacs/conversations/http/HttpConnection.java
index 407a13d9..407a13d9 100644
--- a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpConnection.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
index 9a2a2405..9a2a2405 100644
--- a/conversations/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/AbstractParser.java b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
index 5541c1c6..5541c1c6 100644
--- a/conversations/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/AbstractParser.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/IqParser.java b/src/main/java/eu/siacs/conversations/parser/IqParser.java
index df6754f2..df6754f2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/parser/IqParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/IqParser.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index b5e14305..b5e14305 100644
--- a/conversations/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/parser/PresenceParser.java b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
index 4e90cda8..4e90cda8 100644
--- a/conversations/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/PresenceParser.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index b49cf4e6..b49cf4e6 100644
--- a/conversations/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/FileBackend.java b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
index b891e9ef..b891e9ef 100644
--- a/conversations/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/FileBackend.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java
index 6a457b17..6a457b17 100644
--- a/conversations/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java
+++ b/src/main/java/eu/siacs/conversations/persistance/OnPhoneContactsMerged.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
index 676a09c9..676a09c9 100644
--- a/conversations/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index c0668a19..c0668a19 100644
--- a/conversations/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/eu/siacs/conversations/services/EventReceiver.java
index dfbe9db7..dfbe9db7 100644
--- a/conversations/src/main/java/eu/siacs/conversations/services/EventReceiver.java
+++ b/src/main/java/eu/siacs/conversations/services/EventReceiver.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 00765deb..00765deb 100644
--- a/conversations/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 37e334eb..37e334eb 100644
--- a/conversations/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
index 62a2cbe1..62a2cbe1 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
index 6b4642cb..6b4642cb 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index ae26466e..ae26466e 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
index 91e1c81f..91e1c81f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 0e71801b..0e71801b 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 1543d740..1543d740 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index f8302050..f8302050 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
index 5b5b0608..5b5b0608 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
index 6aa40c41..6aa40c41 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index fc6308fc..fc6308fc 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
index 7e1c3698..7e1c3698 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsFragment.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
index 9fbc3db1..9fbc3db1 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index a1a2d4c2..a1a2d4c2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/UiCallback.java b/src/main/java/eu/siacs/conversations/ui/UiCallback.java
index c80199e1..c80199e1 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/UiCallback.java
+++ b/src/main/java/eu/siacs/conversations/ui/UiCallback.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index d26f0e31..d26f0e31 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index 4ca21a3b..4ca21a3b 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
index 183c89fa..183c89fa 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
index 143dfda1..143dfda1 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/KnownHostsAdapter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
index 977aa7b5..977aa7b5 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index a9a55cbf..a9a55cbf 100644
--- a/conversations/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
index 47595c6e..47595c6e 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
index c51a75ac..c51a75ac 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java
index 88fa18ff..88fa18ff 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java
+++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
index b5fc88bd..b5fc88bd 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
index 9a689768..9a689768 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
+++ b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
index 8fe67234..8fe67234 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
+++ b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
index 5becc7e7..5becc7e7 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
index 5141c83c..5141c83c 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/Validator.java b/src/main/java/eu/siacs/conversations/utils/Validator.java
index 00130fa2..00130fa2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/Validator.java
+++ b/src/main/java/eu/siacs/conversations/utils/Validator.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
index 4dee07cf..4dee07cf 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
+++ b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java
index b777c10c..b777c10c 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java
+++ b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibInputStream.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java
index 8b3f5e68..8b3f5e68 100644
--- a/conversations/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java
+++ b/src/main/java/eu/siacs/conversations/utils/zlib/ZLibOutputStream.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/Element.java b/src/main/java/eu/siacs/conversations/xml/Element.java
index 4e11ee2c..4e11ee2c 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xml/Element.java
+++ b/src/main/java/eu/siacs/conversations/xml/Element.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/Tag.java b/src/main/java/eu/siacs/conversations/xml/Tag.java
index b9ef979f..b9ef979f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xml/Tag.java
+++ b/src/main/java/eu/siacs/conversations/xml/Tag.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/TagWriter.java b/src/main/java/eu/siacs/conversations/xml/TagWriter.java
index f11c1846..f11c1846 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xml/TagWriter.java
+++ b/src/main/java/eu/siacs/conversations/xml/TagWriter.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
index 52d3d46a..52d3d46a 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java
index f09cf33d..f09cf33d 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnBindListener.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java
index 849e8e76..849e8e76 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnContactStatusChanged.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java
index a4cff986..a4cff986 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnIqPacketReceived.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java
index 5f670d93..5f670d93 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnMessageAcknowledged.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
index 325e945f..325e945f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnMessagePacketReceived.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
index 95c1acfc..95c1acfc 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnPresencePacketReceived.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java
index ad1d98cb..ad1d98cb 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/OnStatusChanged.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java
index d4502d73..d4502d73 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/PacketReceived.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 903dc59d..903dc59d 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
index 3e7c7b68..3e7c7b68 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index a0b2feb2..a0b2feb2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
index 1e7c84d4..1e7c84d4 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
index cc1e92f6..cc1e92f6 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index 1da2f0cd..1da2f0cd 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
index 1374e61c..1374e61c 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
index e45e7441..e45e7441 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java
index 2aaf62a1..2aaf62a1 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnJinglePacketReceived.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java
index 03a437b2..03a437b2 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java
index 38f03c5d..38f03c5d 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
index bcadbe77..bcadbe77 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
index 77a73643..77a73643 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
index 610d5e76..610d5e76 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
index 154fadf6..154fadf6 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/pep/Avatar.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index eef41c79..eef41c79 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
index 9df05e67..9df05e67 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/IqPacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
index 4e7b532b..4e7b532b 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java
index 7ea32099..7ea32099 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/PresencePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
index 78ab66d8..78ab66d8 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/ActivePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
index f109280f..f109280f 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/csi/InactivePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
index f93b5d87..f93b5d87 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/AckPacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
index 78cd81ed..78cd81ed 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/EnablePacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
index 98cfc748..98cfc748 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/RequestPacket.java
diff --git a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
index 9cdcfa5e..9cdcfa5e 100644
--- a/conversations/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/streammgmt/ResumePacket.java
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_add_group.png b/src/main/res/drawable-hdpi/ic_action_add_group.png
index 97640355..97640355 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-hdpi/ic_action_add_group.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_add_person.png b/src/main/res/drawable-hdpi/ic_action_add_person.png
index 9d88d0f4..9d88d0f4 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-hdpi/ic_action_add_person.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
index 0847ac46..0847ac46 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_chat.png
+++ b/src/main/res/drawable-hdpi/ic_action_chat.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_copy.png b/src/main/res/drawable-hdpi/ic_action_copy.png
index 22327391..22327391 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_copy.png
+++ b/src/main/res/drawable-hdpi/ic_action_copy.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png
index 703b31f8..703b31f8 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_discard.png
+++ b/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_edit.png b/src/main/res/drawable-hdpi/ic_action_edit.png
index 756db316..756db316 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_edit.png
+++ b/src/main/res/drawable-hdpi/ic_action_edit.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_edit_dark.png b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
index 5f7c6eff..5f7c6eff 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_group.png b/src/main/res/drawable-hdpi/ic_action_group.png
index 3e7f16d5..3e7f16d5 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_group.png
+++ b/src/main/res/drawable-hdpi/ic_action_group.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_new.png b/src/main/res/drawable-hdpi/ic_action_new.png
index d866d616..d866d616 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_new.png
+++ b/src/main/res/drawable-hdpi/ic_action_new.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_new_attachment.png b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
index c01c2b38..c01c2b38 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_not_secure.png b/src/main/res/drawable-hdpi/ic_action_not_secure.png
index 2c917615..2c917615 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-hdpi/ic_action_not_secure.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_refresh.png b/src/main/res/drawable-hdpi/ic_action_refresh.png
index 45b22282..45b22282 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-hdpi/ic_action_refresh.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_remove.png b/src/main/res/drawable-hdpi/ic_action_remove.png
index 58a56e45..58a56e45 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_remove.png
+++ b/src/main/res/drawable-hdpi/ic_action_remove.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png
index 772e3598..772e3598 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_search.png
+++ b/src/main/res/drawable-hdpi/ic_action_search.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
index 4439d1ae..4439d1ae 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_secure.png
+++ b/src/main/res/drawable-hdpi/ic_action_secure.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png
index 505cbe63..505cbe63 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_away.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
index a376524d..a376524d 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
index d4d2d510..d4d2d510 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png
index 48676f7b..48676f7b 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_online.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_activity.png b/src/main/res/drawable-hdpi/ic_activity.png
index 613da683..613da683 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_activity.png
+++ b/src/main/res/drawable-hdpi/ic_activity.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png
index 6de8969f..6de8969f 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_indicator.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
index d48df2c3..d48df2c3 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_launcher.png
+++ b/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png
index 664ba535..664ba535 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_notification.png
+++ b/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_profile.png b/src/main/res/drawable-hdpi/ic_profile.png
index 3f071dec..3f071dec 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_profile.png
+++ b/src/main/res/drawable-hdpi/ic_profile.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png
index b1e3f274..b1e3f274 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_received_indicator.png
diff --git a/conversations/src/main/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png
index 2a2934fb..2a2934fb 100644
--- a/conversations/src/main/res/drawable-hdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_secure_indicator.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
index b8f44c21..b8f44c21 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
index 5512dbd3..5512dbd3 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
index e5f1df22..e5f1df22 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
index 7cd46d63..7cd46d63 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
index 438ecdd8..438ecdd8 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
index 4f18a95a..4f18a95a 100644
--- a/conversations/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_add_group.png b/src/main/res/drawable-mdpi/ic_action_add_group.png
index 9a655899..9a655899 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-mdpi/ic_action_add_group.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_add_person.png b/src/main/res/drawable-mdpi/ic_action_add_person.png
index b7d8f46a..b7d8f46a 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-mdpi/ic_action_add_person.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
index 8fdb5d75..8fdb5d75 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_chat.png
+++ b/src/main/res/drawable-mdpi/ic_action_chat.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_copy.png b/src/main/res/drawable-mdpi/ic_action_copy.png
index 71348202..71348202 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_copy.png
+++ b/src/main/res/drawable-mdpi/ic_action_copy.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_discard.png b/src/main/res/drawable-mdpi/ic_action_discard.png
index 248fb09c..248fb09c 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_discard.png
+++ b/src/main/res/drawable-mdpi/ic_action_discard.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_edit.png b/src/main/res/drawable-mdpi/ic_action_edit.png
index 68a45320..68a45320 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_edit.png
+++ b/src/main/res/drawable-mdpi/ic_action_edit.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_edit_dark.png b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
index 650b4d89..650b4d89 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_group.png b/src/main/res/drawable-mdpi/ic_action_group.png
index 1ee3cccd..1ee3cccd 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_group.png
+++ b/src/main/res/drawable-mdpi/ic_action_group.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_new.png b/src/main/res/drawable-mdpi/ic_action_new.png
index f17e7980..f17e7980 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_new.png
+++ b/src/main/res/drawable-mdpi/ic_action_new.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_new_attachment.png b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
index 1d265aac..1d265aac 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_not_secure.png b/src/main/res/drawable-mdpi/ic_action_not_secure.png
index faffa233..faffa233 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-mdpi/ic_action_not_secure.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png
index de008e51..de008e51 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-mdpi/ic_action_refresh.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_remove.png b/src/main/res/drawable-mdpi/ic_action_remove.png
index 342a79de..342a79de 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_remove.png
+++ b/src/main/res/drawable-mdpi/ic_action_remove.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_search.png b/src/main/res/drawable-mdpi/ic_action_search.png
index 4edb1ff9..4edb1ff9 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_search.png
+++ b/src/main/res/drawable-mdpi/ic_action_search.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
index 05332ebf..05332ebf 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_secure.png
+++ b/src/main/res/drawable-mdpi/ic_action_secure.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_away.png b/src/main/res/drawable-mdpi/ic_action_send_now_away.png
index 0fdca901..0fdca901 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_away.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
index c0aef36c..c0aef36c 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_offline.png b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
index 7723f4aa..7723f4aa 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_online.png b/src/main/res/drawable-mdpi/ic_action_send_now_online.png
index 39d00ee4..39d00ee4 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_online.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_activity.png b/src/main/res/drawable-mdpi/ic_activity.png
index c8727f57..c8727f57 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_activity.png
+++ b/src/main/res/drawable-mdpi/ic_activity.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_indicator.png b/src/main/res/drawable-mdpi/ic_indicator.png
index bb4fee10..bb4fee10 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_indicator.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
index 200daf4c..200daf4c 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_launcher.png
+++ b/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png
index 5d1aca10..5d1aca10 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_notification.png
+++ b/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_profile.png b/src/main/res/drawable-mdpi/ic_profile.png
index 0d056c7c..0d056c7c 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_profile.png
+++ b/src/main/res/drawable-mdpi/ic_profile.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png
index 88ff1efb..88ff1efb 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_received_indicator.png
diff --git a/conversations/src/main/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png
index 5a73aef4..5a73aef4 100644
--- a/conversations/src/main/res/drawable-mdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_secure_indicator.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
index 09d42dc8..09d42dc8 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
index 20af01de..20af01de 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
index 13a878be..13a878be 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
index ad2dbae9..ad2dbae9 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
index dfff5ac8..dfff5ac8 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
index 4365d178..4365d178 100644
--- a/conversations/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_add_group.png b/src/main/res/drawable-xhdpi/ic_action_add_group.png
index c493aa5a..c493aa5a 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-xhdpi/ic_action_add_group.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_add_person.png b/src/main/res/drawable-xhdpi/ic_action_add_person.png
index 4e8de1b6..4e8de1b6 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
index 8a9a4314..8a9a4314 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_chat.png
+++ b/src/main/res/drawable-xhdpi/ic_action_chat.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_copy.png b/src/main/res/drawable-xhdpi/ic_action_copy.png
index 5ddf1513..5ddf1513 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_copy.png
+++ b/src/main/res/drawable-xhdpi/ic_action_copy.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png
index 9eeeed12..9eeeed12 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_discard.png
+++ b/src/main/res/drawable-xhdpi/ic_action_discard.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_edit.png b/src/main/res/drawable-xhdpi/ic_action_edit.png
index 67e056fe..67e056fe 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_edit.png
+++ b/src/main/res/drawable-xhdpi/ic_action_edit.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
index 8ab436d8..8ab436d8 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_group.png b/src/main/res/drawable-xhdpi/ic_action_group.png
index fa2af497..fa2af497 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_group.png
+++ b/src/main/res/drawable-xhdpi/ic_action_group.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_new.png b/src/main/res/drawable-xhdpi/ic_action_new.png
index dde2141f..dde2141f 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_new.png
+++ b/src/main/res/drawable-xhdpi/ic_action_new.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
index 41cbab20..41cbab20 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_not_secure.png b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
index c0902a03..c0902a03 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_refresh.png b/src/main/res/drawable-xhdpi/ic_action_refresh.png
index cdc160d4..cdc160d4 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xhdpi/ic_action_refresh.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_remove.png b/src/main/res/drawable-xhdpi/ic_action_remove.png
index 58e2e3b4..58e2e3b4 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_remove.png
+++ b/src/main/res/drawable-xhdpi/ic_action_remove.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png
index 19658e4a..19658e4a 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_search.png
+++ b/src/main/res/drawable-xhdpi/ic_action_search.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
index 4e08b95a..4e08b95a 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_secure.png
+++ b/src/main/res/drawable-xhdpi/ic_action_secure.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
index bb999d85..bb999d85 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
index a0bf5561..a0bf5561 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
index 6da9ff7b..6da9ff7b 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
index 348ba657..348ba657 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_activity.png b/src/main/res/drawable-xhdpi/ic_activity.png
index 95ffbecf..95ffbecf 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_activity.png
+++ b/src/main/res/drawable-xhdpi/ic_activity.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_indicator.png b/src/main/res/drawable-xhdpi/ic_indicator.png
index 3e5141c2..3e5141c2 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_indicator.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
index 927a2d2a..927a2d2a 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png
index dfa643d0..dfa643d0 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_notification.png
+++ b/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_profile.png b/src/main/res/drawable-xhdpi/ic_profile.png
index 88a82cf0..88a82cf0 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_profile.png
+++ b/src/main/res/drawable-xhdpi/ic_profile.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png
index 2c871933..2c871933 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_received_indicator.png
diff --git a/conversations/src/main/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
index 1f4c9a32..1f4c9a32 100644
--- a/conversations/src/main/res/drawable-xhdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
index 34eb4ec0..34eb4ec0 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
index 3155ef69..3155ef69 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
index 5c2440e4..5c2440e4 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
index e9ab742e..e9ab742e 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
index 42a2191e..42a2191e 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
index a5a2c25e..a5a2c25e 100644
--- a/conversations/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
index 2b46dbb9..2b46dbb9 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
index e9a58eaf..e9a58eaf 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
index 04000fd0..04000fd0 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_chat.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_chat.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png
index a0508df8..a0508df8 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_copy.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_copy.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
index cb1260a4..cb1260a4 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_discard.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png
index 3a241ea4..3a241ea4 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
index f2b2078b..f2b2078b 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png
index 9289b1c8..9289b1c8 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_group.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png
index c42c2bfb..c42c2bfb 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_new.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
index ce7536cb..ce7536cb 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
index a186f1fb..a186f1fb 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
index cb847f37..cb847f37 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png
index 331c545b..331c545b 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_remove.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_remove.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
index a1086388..a1086388 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_search.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_search.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
index ccf1fb00..ccf1fb00 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_secure.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
index 12ec4d33..12ec4d33 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
index 7719f81a..7719f81a 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
index 18895813..18895813 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
index 29bde36e..29bde36e 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png
index 0b642d9b..0b642d9b 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_activity.png
+++ b/src/main/res/drawable-xxhdpi/ic_activity.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
index 2c51b8b7..2c51b8b7 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_indicator.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index 65c1af34..65c1af34 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png
index ee1e9534..ee1e9534 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_notification.png
+++ b/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_profile.png b/src/main/res/drawable-xxhdpi/ic_profile.png
index 309dc513..309dc513 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_profile.png
+++ b/src/main/res/drawable-xxhdpi/ic_profile.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
index 039a9ef9..039a9ef9 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
index 1ee9b67d..1ee9b67d 100644
--- a/conversations/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
index e4439e7c..e4439e7c 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
index dd2ded89..dd2ded89 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
index 58c8a576..58c8a576 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
index 566062f0..566062f0 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
index 432e68c4..432e68c4 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
diff --git a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
index 8dd01d5c..8dd01d5c 100644
--- a/conversations/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
diff --git a/conversations/src/main/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
index 5598ee42..5598ee42 100644
--- a/conversations/src/main/res/drawable/actionbar_tab_indicator.xml
+++ b/src/main/res/drawable/actionbar_tab_indicator.xml
diff --git a/conversations/src/main/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml
index 44ffd4ea..44ffd4ea 100644
--- a/conversations/src/main/res/drawable/es_slidingpane_shadow.xml
+++ b/src/main/res/drawable/es_slidingpane_shadow.xml
diff --git a/conversations/src/main/res/drawable/grey.xml b/src/main/res/drawable/grey.xml
index 2e90d96d..2e90d96d 100644
--- a/conversations/src/main/res/drawable/grey.xml
+++ b/src/main/res/drawable/grey.xml
diff --git a/conversations/src/main/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml
index bedc4b17..bedc4b17 100644
--- a/conversations/src/main/res/drawable/greybackground.xml
+++ b/src/main/res/drawable/greybackground.xml
diff --git a/conversations/src/main/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml
index af7d5d22..af7d5d22 100644
--- a/conversations/src/main/res/drawable/infocard_border.xml
+++ b/src/main/res/drawable/infocard_border.xml
diff --git a/conversations/src/main/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
index b35693d5..b35693d5 100644
--- a/conversations/src/main/res/drawable/message_border.xml
+++ b/src/main/res/drawable/message_border.xml
diff --git a/conversations/src/main/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml
index 13818618..13818618 100644
--- a/conversations/src/main/res/drawable/snackbar.xml
+++ b/src/main/res/drawable/snackbar.xml
diff --git a/conversations/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
index a600118d..a600118d 100644
--- a/conversations/src/main/res/layout-w360dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
diff --git a/conversations/src/main/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
index c3aa67ae..c3aa67ae 100644
--- a/conversations/src/main/res/layout-w384dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
diff --git a/conversations/src/main/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
index 331fb1f0..331fb1f0 100644
--- a/conversations/src/main/res/layout-w600dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
diff --git a/conversations/src/main/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
index 2744f38e..2744f38e 100644
--- a/conversations/src/main/res/layout-w960dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
diff --git a/conversations/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 2d1190a3..2d1190a3 100644
--- a/conversations/src/main/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
diff --git a/conversations/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
index 64b75f0e..64b75f0e 100644
--- a/conversations/src/main/res/layout/actionview_search.xml
+++ b/src/main/res/layout/actionview_search.xml
diff --git a/conversations/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index 248a7822..248a7822 100644
--- a/conversations/src/main/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
diff --git a/conversations/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f7cb2198..f7cb2198 100644
--- a/conversations/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
diff --git a/conversations/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 97289628..97289628 100644
--- a/conversations/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
diff --git a/conversations/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..f689f10d 100644
--- a/conversations/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
diff --git a/conversations/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index fac499bc..fac499bc 100644
--- a/conversations/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
diff --git a/conversations/src/main/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index f9c98529..f9c98529 100644
--- a/conversations/src/main/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
diff --git a/conversations/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 12ab3da1..12ab3da1 100644
--- a/conversations/src/main/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
diff --git a/conversations/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7053857f..7053857f 100644
--- a/conversations/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
diff --git a/conversations/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a..21147b4a 100644
--- a/conversations/src/main/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
diff --git a/conversations/src/main/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
index 1ab4b686..1ab4b686 100644
--- a/conversations/src/main/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/create_contact_dialog.xml
diff --git a/conversations/src/main/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 252808c8..252808c8 100644
--- a/conversations/src/main/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
diff --git a/conversations/src/main/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml
index 499ef6cd..499ef6cd 100644
--- a/conversations/src/main/res/layout/dialog_verify_otr.xml
+++ b/src/main/res/layout/dialog_verify_otr.xml
diff --git a/conversations/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f9aae10a..f9aae10a 100644
--- a/conversations/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
diff --git a/conversations/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index d4145761..d4145761 100644
--- a/conversations/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
diff --git a/conversations/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 95c9d24c..95c9d24c 100644
--- a/conversations/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
diff --git a/conversations/src/main/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 11ce35b2..11ce35b2 100644
--- a/conversations/src/main/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
diff --git a/conversations/src/main/res/layout/message_null.xml b/src/main/res/layout/message_null.xml
index 0e0f1c92..0e0f1c92 100644
--- a/conversations/src/main/res/layout/message_null.xml
+++ b/src/main/res/layout/message_null.xml
diff --git a/conversations/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 730d00d5..730d00d5 100644
--- a/conversations/src/main/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
diff --git a/conversations/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index e3e9b673..e3e9b673 100644
--- a/conversations/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
diff --git a/conversations/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d5f8bb33..d5f8bb33 100644
--- a/conversations/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
diff --git a/conversations/src/main/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index 20a2868a..20a2868a 100644
--- a/conversations/src/main/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
diff --git a/conversations/src/main/res/layout/share_with.xml b/src/main/res/layout/share_with.xml
index 41b6033d..41b6033d 100644
--- a/conversations/src/main/res/layout/share_with.xml
+++ b/src/main/res/layout/share_with.xml
diff --git a/conversations/src/main/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 20932489..20932489 100644
--- a/conversations/src/main/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
diff --git a/conversations/src/main/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..e39091b3 100644
--- a/conversations/src/main/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
diff --git a/conversations/src/main/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml
index fd898580..fd898580 100644
--- a/conversations/src/main/res/menu/conference_context.xml
+++ b/src/main/res/menu/conference_context.xml
diff --git a/conversations/src/main/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
index 11ac7d7c..11ac7d7c 100644
--- a/conversations/src/main/res/menu/contact_context.xml
+++ b/src/main/res/menu/contact_context.xml
diff --git a/conversations/src/main/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 02f2e813..02f2e813 100644
--- a/conversations/src/main/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
diff --git a/conversations/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 3edee120..3edee120 100644
--- a/conversations/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
diff --git a/conversations/src/main/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index adf0ad8d..adf0ad8d 100644
--- a/conversations/src/main/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
diff --git a/conversations/src/main/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index b5cd9b50..b5cd9b50 100644
--- a/conversations/src/main/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
diff --git a/conversations/src/main/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index 7a7cc0a2..7a7cc0a2 100644
--- a/conversations/src/main/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
diff --git a/conversations/src/main/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 97369098..97369098 100644
--- a/conversations/src/main/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
diff --git a/conversations/src/main/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..cbd15c11 100644
--- a/conversations/src/main/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
diff --git a/conversations/src/main/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index f7230169..f7230169 100644
--- a/conversations/src/main/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
diff --git a/conversations/src/main/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml
index ff1a0d4b..ff1a0d4b 100644
--- a/conversations/src/main/res/values-ca/arrays.xml
+++ b/src/main/res/values-ca/arrays.xml
diff --git a/conversations/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index cfbe428b..cfbe428b 100644
--- a/conversations/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
diff --git a/conversations/src/main/res/values-cs/arrays.xml b/src/main/res/values-cs/arrays.xml
index 4510cf84..4510cf84 100644
--- a/conversations/src/main/res/values-cs/arrays.xml
+++ b/src/main/res/values-cs/arrays.xml
diff --git a/conversations/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 185c5d31..185c5d31 100644
--- a/conversations/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
diff --git a/conversations/src/main/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml
index 9b429c5a..9b429c5a 100644
--- a/conversations/src/main/res/values-de/arrays.xml
+++ b/src/main/res/values-de/arrays.xml
diff --git a/conversations/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 72121774..72121774 100644
--- a/conversations/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
diff --git a/conversations/src/main/res/values-es/arrays.xml b/src/main/res/values-es/arrays.xml
index 15231955..15231955 100644
--- a/conversations/src/main/res/values-es/arrays.xml
+++ b/src/main/res/values-es/arrays.xml
diff --git a/conversations/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 7fdc95c0..7fdc95c0 100644
--- a/conversations/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
diff --git a/conversations/src/main/res/values-eu/arrays.xml b/src/main/res/values-eu/arrays.xml
index a34d3c6a..a34d3c6a 100644
--- a/conversations/src/main/res/values-eu/arrays.xml
+++ b/src/main/res/values-eu/arrays.xml
diff --git a/conversations/src/main/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 43c141ea..43c141ea 100644
--- a/conversations/src/main/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
diff --git a/conversations/src/main/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml
index ae140796..ae140796 100644
--- a/conversations/src/main/res/values-fr/arrays.xml
+++ b/src/main/res/values-fr/arrays.xml
diff --git a/conversations/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e1db316d..e1db316d 100644
--- a/conversations/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
diff --git a/conversations/src/main/res/values-gl/arrays.xml b/src/main/res/values-gl/arrays.xml
index 19424a78..19424a78 100644
--- a/conversations/src/main/res/values-gl/arrays.xml
+++ b/src/main/res/values-gl/arrays.xml
diff --git a/conversations/src/main/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 58116463..58116463 100644
--- a/conversations/src/main/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
diff --git a/conversations/src/main/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml
index 491c4438..491c4438 100644
--- a/conversations/src/main/res/values-it/arrays.xml
+++ b/src/main/res/values-it/arrays.xml
diff --git a/conversations/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0bb0e05e..0bb0e05e 100644
--- a/conversations/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
diff --git a/conversations/src/main/res/values-iw/arrays.xml b/src/main/res/values-iw/arrays.xml
index 28768d6c..28768d6c 100644
--- a/conversations/src/main/res/values-iw/arrays.xml
+++ b/src/main/res/values-iw/arrays.xml
diff --git a/conversations/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index fd8eaa0b..fd8eaa0b 100644
--- a/conversations/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
diff --git a/conversations/src/main/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml
index 9ced79f4..9ced79f4 100644
--- a/conversations/src/main/res/values-nl/arrays.xml
+++ b/src/main/res/values-nl/arrays.xml
diff --git a/conversations/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 7b3faca9..7b3faca9 100644
--- a/conversations/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
diff --git a/conversations/src/main/res/values-ru/arrays.xml b/src/main/res/values-ru/arrays.xml
index d01d4eb9..d01d4eb9 100644
--- a/conversations/src/main/res/values-ru/arrays.xml
+++ b/src/main/res/values-ru/arrays.xml
diff --git a/conversations/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2aa26b0b..2aa26b0b 100644
--- a/conversations/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
diff --git a/conversations/src/main/res/values-sv/arrays.xml b/src/main/res/values-sv/arrays.xml
index 890e2915..890e2915 100644
--- a/conversations/src/main/res/values-sv/arrays.xml
+++ b/src/main/res/values-sv/arrays.xml
diff --git a/conversations/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index a3ed9112..a3ed9112 100644
--- a/conversations/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
diff --git a/conversations/src/main/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
index 1a243079..1a243079 100644
--- a/conversations/src/main/res/values-zh-rCN/arrays.xml
+++ b/src/main/res/values-zh-rCN/arrays.xml
diff --git a/conversations/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a7898425..a7898425 100644
--- a/conversations/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
diff --git a/conversations/src/main/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
index b9c261ad..b9c261ad 100644
--- a/conversations/src/main/res/values-zh-rTW/arrays.xml
+++ b/src/main/res/values-zh-rTW/arrays.xml
diff --git a/conversations/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 2c3ea225..2c3ea225 100644
--- a/conversations/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
diff --git a/conversations/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 1a4fd25d..1a4fd25d 100644
--- a/conversations/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
diff --git a/conversations/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8..2354a5e8 100644
--- a/conversations/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
diff --git a/conversations/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 908b8b89..908b8b89 100644
--- a/conversations/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
diff --git a/conversations/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3862bb7b..3862bb7b 100644
--- a/conversations/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
diff --git a/conversations/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 64bde770..64bde770 100644
--- a/conversations/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
diff --git a/conversations/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d2..fa7973d2 100644
--- a/conversations/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
diff --git a/conversations/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 06ab7560..06ab7560 100644
--- a/conversations/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml