Make conversations the root project

313 files changed, 0 insertions, 0 deletions

diff --git a/conversations/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 7bde645f4..7bde645f4 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 1725eca69..1725eca69 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 e0bd0e793..e0bd0e793 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 2696c7d2a..2696c7d2a 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 92b8a7298..92b8a7298 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 80a9d62f9..80a9d62f9 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 dd9e805c2..dd9e805c2 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 60c31a424..60c31a424 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 9d4c36db5..9d4c36db5 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 70516b204..70516b204 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 1605c75b4..1605c75b4 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 a1872d2f2..a1872d2f2 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 a390c7ca0..a390c7ca0 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 d7407cd5e..d7407cd5e 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 b58998473..b58998473 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 3267b15ae..3267b15ae 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 c96d116d0..c96d116d0 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 d44bf0ca1..d44bf0ca1 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 dd833e56c..dd833e56c 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 d896dd001..d896dd001 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 407a13d94..407a13d94 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 9a2a24052..9a2a24052 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 5541c1c61..5541c1c61 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 df6754f26..df6754f26 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 b5e14305a..b5e14305a 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 4e90cda8c..4e90cda8c 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 b49cf4e61..b49cf4e61 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 b891e9ef5..b891e9ef5 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 6a457b17f..6a457b17f 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 676a09c97..676a09c97 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 c0668a193..c0668a193 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 dfbe9db76..dfbe9db76 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 00765deb7..00765deb7 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 37e334eb6..37e334eb6 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 62a2cbe15..62a2cbe15 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 6b4642cbe..6b4642cbe 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 ae26466e3..ae26466e3 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 91e1c81f9..91e1c81f9 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 0e71801bd..0e71801bd 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 1543d7402..1543d7402 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 f83020506..f83020506 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 5b5b0608f..5b5b0608f 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 6aa40c418..6aa40c418 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 fc6308fce..fc6308fce 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 7e1c36989..7e1c36989 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 9fbc3db10..9fbc3db10 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 a1a2d4c2a..a1a2d4c2a 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 c80199e17..c80199e17 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 d26f0e31d..d26f0e31d 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 4ca21a3b3..4ca21a3b3 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 183c89fad..183c89fad 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 143dfda12..143dfda12 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 977aa7b57..977aa7b57 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 a9a55cbf4..a9a55cbf4 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 47595c6e3..47595c6e3 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 c51a75ac6..c51a75ac6 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 88fa18ff2..88fa18ff2 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 b5fc88bdd..b5fc88bdd 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 9a6897689..9a6897689 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 8fe67234e..8fe67234e 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 5becc7e79..5becc7e79 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 5141c83c4..5141c83c4 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 00130fa21..00130fa21 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 4dee07cf7..4dee07cf7 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 b777c10c8..b777c10c8 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 8b3f5e681..8b3f5e681 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 4e11ee2cd..4e11ee2cd 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 b9ef979ff..b9ef979ff 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 f11c18464..f11c18464 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 52d3d46ac..52d3d46ac 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 f09cf33dd..f09cf33dd 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 849e8e764..849e8e764 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 a4cff9863..a4cff9863 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 5f670d933..5f670d933 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 325e945f0..325e945f0 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 95c1acfcc..95c1acfcc 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 ad1d98cb9..ad1d98cb9 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 d4502d734..d4502d734 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 903dc59d2..903dc59d2 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 3e7c7b682..3e7c7b682 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 a0b2feb21..a0b2feb21 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 1e7c84d45..1e7c84d45 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 cc1e92f62..cc1e92f62 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 1da2f0cdf..1da2f0cdf 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 1374e61cc..1374e61cc 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 e45e7441d..e45e7441d 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 2aaf62a1b..2aaf62a1b 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 03a437b2b..03a437b2b 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 38f03c5d0..38f03c5d0 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 bcadbe778..bcadbe778 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 77a736437..77a736437 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 610d5e760..610d5e760 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 154fadf65..154fadf65 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 eef41c791..eef41c791 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 9df05e678..9df05e678 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 4e7b532bf..4e7b532bf 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 7ea320995..7ea320995 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 78ab66d8f..78ab66d8f 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 f109280f1..f109280f1 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 f93b5d870..f93b5d870 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 78cd81edc..78cd81edc 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 98cfc748b..98cfc748b 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 9cdcfa5ec..9cdcfa5ec 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 976403554..976403554 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 9d88d0f48..9d88d0f48 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 0847ac466..0847ac466 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 22327391e..22327391e 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 703b31f80..703b31f80 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 756db316e..756db316e 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 5f7c6eff3..5f7c6eff3 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 3e7f16d51..3e7f16d51 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 d866d6160..d866d6160 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 c01c2b382..c01c2b382 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 2c917615f..2c917615f 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 45b22282f..45b22282f 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 58a56e457..58a56e457 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 772e3598e..772e3598e 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 4439d1aec..4439d1aec 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 505cbe63a..505cbe63a 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 a376524d7..a376524d7 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 d4d2d5103..d4d2d5103 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 48676f7bd..48676f7bd 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 613da683a..613da683a 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 6de8969fa..6de8969fa 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 d48df2c38..d48df2c38 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 664ba5352..664ba5352 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 3f071dec7..3f071dec7 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 b1e3f2748..b1e3f2748 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 2a2934fb1..2a2934fb1 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 b8f44c21e..b8f44c21e 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 5512dbd30..5512dbd30 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 e5f1df225..e5f1df225 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 7cd46d63d..7cd46d63d 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 438ecdd88..438ecdd88 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 4f18a95ad..4f18a95ad 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 9a6558992..9a6558992 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 b7d8f46a9..b7d8f46a9 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 8fdb5d752..8fdb5d752 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 713482020..713482020 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 248fb09cd..248fb09cd 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 68a453209..68a453209 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 650b4d899..650b4d899 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 1ee3cccdd..1ee3cccdd 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 f17e7980e..f17e7980e 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 1d265aac6..1d265aac6 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 faffa2337..faffa2337 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 de008e51a..de008e51a 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 342a79de6..342a79de6 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 4edb1ff92..4edb1ff92 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 05332ebfa..05332ebfa 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 0fdca901a..0fdca901a 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 c0aef36cc..c0aef36cc 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 7723f4aa9..7723f4aa9 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 39d00ee48..39d00ee48 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 c8727f572..c8727f572 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 bb4fee105..bb4fee105 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 200daf4c9..200daf4c9 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 5d1aca103..5d1aca103 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 0d056c7cc..0d056c7cc 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 88ff1efb9..88ff1efb9 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 5a73aef4b..5a73aef4b 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 09d42dc82..09d42dc82 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 20af01dea..20af01dea 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 13a878bed..13a878bed 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 ad2dbae95..ad2dbae95 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 dfff5ac87..dfff5ac87 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 4365d1780..4365d1780 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 c493aa5a4..c493aa5a4 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 4e8de1b61..4e8de1b61 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 8a9a43141..8a9a43141 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 5ddf15139..5ddf15139 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 9eeeed124..9eeeed124 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 67e056fef..67e056fef 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 8ab436d87..8ab436d87 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 fa2af4974..fa2af4974 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 dde2141f2..dde2141f2 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 41cbab203..41cbab203 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 c0902a03e..c0902a03e 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 cdc160d4c..cdc160d4c 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 58e2e3b4d..58e2e3b4d 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 19658e4a2..19658e4a2 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 4e08b95ad..4e08b95ad 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 bb999d85d..bb999d85d 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 a0bf5561c..a0bf5561c 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 6da9ff7bd..6da9ff7bd 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 348ba657d..348ba657d 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 95ffbecf9..95ffbecf9 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 3e5141c28..3e5141c28 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 927a2d2a5..927a2d2a5 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 dfa643d05..dfa643d05 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 88a82cf09..88a82cf09 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 2c8719337..2c8719337 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 1f4c9a32e..1f4c9a32e 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 34eb4ec00..34eb4ec00 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 3155ef699..3155ef699 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 5c2440e4a..5c2440e4a 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 e9ab742e8..e9ab742e8 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 42a2191ee..42a2191ee 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 a5a2c25ef..a5a2c25ef 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 2b46dbb9a..2b46dbb9a 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 e9a58eafc..e9a58eafc 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 04000fd0f..04000fd0f 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 a0508df8c..a0508df8c 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 cb1260a4c..cb1260a4c 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 3a241ea41..3a241ea41 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 f2b2078b0..f2b2078b0 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 9289b1c8f..9289b1c8f 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 c42c2bfb5..c42c2bfb5 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 ce7536cbd..ce7536cbd 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 a186f1fb2..a186f1fb2 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 cb847f378..cb847f378 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 331c545b8..331c545b8 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 a10863887..a10863887 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 ccf1fb00c..ccf1fb00c 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 12ec4d33f..12ec4d33f 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 7719f81a9..7719f81a9 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 188958132..188958132 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 29bde36e3..29bde36e3 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 0b642d9bb..0b642d9bb 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 2c51b8b76..2c51b8b76 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 65c1af343..65c1af343 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 ee1e95346..ee1e95346 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 309dc5138..309dc5138 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 039a9ef9b..039a9ef9b 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 1ee9b67dc..1ee9b67dc 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 e4439e7c9..e4439e7c9 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 dd2ded899..dd2ded899 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 58c8a576f..58c8a576f 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 566062f0d..566062f0d 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 432e68c4f..432e68c4f 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 8dd01d5c2..8dd01d5c2 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 5598ee424..5598ee424 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 44ffd4ea6..44ffd4ea6 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 2e90d96d0..2e90d96d0 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 bedc4b17a..bedc4b17a 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 af7d5d22b..af7d5d22b 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 b35693d5c..b35693d5c 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 138186184..138186184 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 a600118db..a600118db 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 c3aa67ae6..c3aa67ae6 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 331fb1f06..331fb1f06 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 2744f38ef..2744f38ef 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 2d1190a3a..2d1190a3a 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 64b75f0ed..64b75f0ed 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 248a7822c..248a7822c 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 f7cb2198c..f7cb2198c 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 97289628c..97289628c 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 f689f10d3..f689f10d3 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 fac499bce..fac499bce 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 f9c985292..f9c985292 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 12ab3da1b..12ab3da1b 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 7053857fb..7053857fb 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 21147b4a0..21147b4a0 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 1ab4b6862..1ab4b6862 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 252808c84..252808c84 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 499ef6cde..499ef6cde 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 f9aae10a0..f9aae10a0 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 d4145761d..d4145761d 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 95c9d24cb..95c9d24cb 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 11ce35b2f..11ce35b2f 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 0e0f1c924..0e0f1c924 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 730d00d53..730d00d53 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 e3e9b673e..e3e9b673e 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 d5f8bb33f..d5f8bb33f 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 20a2868ac..20a2868ac 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 41b6033da..41b6033da 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 20932489d..20932489d 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 e39091b38..e39091b38 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 fd898580a..fd898580a 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 11ac7d7c0..11ac7d7c0 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 02f2e8131..02f2e8131 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 3edee120a..3edee120a 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 adf0ad8dc..adf0ad8dc 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 b5cd9b50b..b5cd9b50b 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 7a7cc0a22..7a7cc0a22 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 973690984..973690984 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 cbd15c119..cbd15c119 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 f72301693..f72301693 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 ff1a0d4ba..ff1a0d4ba 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 cfbe428bf..cfbe428bf 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 4510cf842..4510cf842 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 185c5d311..185c5d311 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 9b429c5a7..9b429c5a7 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 72121774b..72121774b 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 152319559..152319559 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 7fdc95c05..7fdc95c05 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 a34d3c6a9..a34d3c6a9 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 43c141eab..43c141eab 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 ae140796a..ae140796a 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 e1db316dc..e1db316dc 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 19424a783..19424a783 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 581164630..581164630 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 491c44384..491c44384 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 0bb0e05ef..0bb0e05ef 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 28768d6c4..28768d6c4 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 fd8eaa0ba..fd8eaa0ba 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 9ced79f49..9ced79f49 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 7b3faca99..7b3faca99 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 d01d4eb9b..d01d4eb9b 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 2aa26b0be..2aa26b0be 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 890e2915f..890e2915f 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 a3ed9112e..a3ed9112e 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 1a2430791..1a2430791 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 a7898425a..a7898425a 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 b9c261adc..b9c261adc 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 2c3ea225c..2c3ea225c 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 1a4fd25d1..1a4fd25d1 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 2354a5e8c..2354a5e8c 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 908b8b89a..908b8b89a 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 3862bb7ba..3862bb7ba 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 64bde7709..64bde7709 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 fa7973d20..fa7973d20 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 06ab7560e..06ab7560e 100644
--- a/conversations/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml