Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

211 files changed, 0 insertions, 0 deletions

diff --git a/res/drawable-hdpi/ic_action_add_group.png b/src/main/res/drawable-hdpi/ic_action_add_group.png
index 97640355..97640355 100644
--- a/res/drawable-hdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-hdpi/ic_action_add_group.png
diff --git a/res/drawable-hdpi/ic_action_add_person.png b/src/main/res/drawable-hdpi/ic_action_add_person.png
index 9d88d0f4..9d88d0f4 100644
--- a/res/drawable-hdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-hdpi/ic_action_add_person.png
diff --git a/res/drawable-hdpi/ic_action_chat.png b/src/main/res/drawable-hdpi/ic_action_chat.png
index 0847ac46..0847ac46 100644
--- a/res/drawable-hdpi/ic_action_chat.png
+++ b/src/main/res/drawable-hdpi/ic_action_chat.png
diff --git a/res/drawable-hdpi/ic_action_copy.png b/src/main/res/drawable-hdpi/ic_action_copy.png
index 22327391..22327391 100644
--- a/res/drawable-hdpi/ic_action_copy.png
+++ b/src/main/res/drawable-hdpi/ic_action_copy.png
diff --git a/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png
index 703b31f8..703b31f8 100644
--- a/res/drawable-hdpi/ic_action_discard.png
+++ b/src/main/res/drawable-hdpi/ic_action_discard.png
diff --git a/res/drawable-hdpi/ic_action_edit.png b/src/main/res/drawable-hdpi/ic_action_edit.png
index 756db316..756db316 100644
--- a/res/drawable-hdpi/ic_action_edit.png
+++ b/src/main/res/drawable-hdpi/ic_action_edit.png
diff --git a/res/drawable-hdpi/ic_action_edit_dark.png b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
index 5f7c6eff..5f7c6eff 100644
--- a/res/drawable-hdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-hdpi/ic_action_edit_dark.png
diff --git a/res/drawable-hdpi/ic_action_group.png b/src/main/res/drawable-hdpi/ic_action_group.png
index 3e7f16d5..3e7f16d5 100644
--- a/res/drawable-hdpi/ic_action_group.png
+++ b/src/main/res/drawable-hdpi/ic_action_group.png
diff --git a/res/drawable-hdpi/ic_action_new.png b/src/main/res/drawable-hdpi/ic_action_new.png
index d866d616..d866d616 100644
--- a/res/drawable-hdpi/ic_action_new.png
+++ b/src/main/res/drawable-hdpi/ic_action_new.png
diff --git a/res/drawable-hdpi/ic_action_new_attachment.png b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
index c01c2b38..c01c2b38 100644
--- a/res/drawable-hdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-hdpi/ic_action_new_attachment.png
diff --git a/res/drawable-hdpi/ic_action_not_secure.png b/src/main/res/drawable-hdpi/ic_action_not_secure.png
index 2c917615..2c917615 100644
--- a/res/drawable-hdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-hdpi/ic_action_not_secure.png
diff --git a/res/drawable-hdpi/ic_action_refresh.png b/src/main/res/drawable-hdpi/ic_action_refresh.png
index 45b22282..45b22282 100644
--- a/res/drawable-hdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-hdpi/ic_action_refresh.png
diff --git a/res/drawable-hdpi/ic_action_remove.png b/src/main/res/drawable-hdpi/ic_action_remove.png
index 58a56e45..58a56e45 100644
--- a/res/drawable-hdpi/ic_action_remove.png
+++ b/src/main/res/drawable-hdpi/ic_action_remove.png
diff --git a/res/drawable-hdpi/ic_action_search.png b/src/main/res/drawable-hdpi/ic_action_search.png
index 772e3598..772e3598 100644
--- a/res/drawable-hdpi/ic_action_search.png
+++ b/src/main/res/drawable-hdpi/ic_action_search.png
diff --git a/res/drawable-hdpi/ic_action_secure.png b/src/main/res/drawable-hdpi/ic_action_secure.png
index 4439d1ae..4439d1ae 100644
--- a/res/drawable-hdpi/ic_action_secure.png
+++ b/src/main/res/drawable-hdpi/ic_action_secure.png
diff --git a/res/drawable-hdpi/ic_action_send_now_away.png b/src/main/res/drawable-hdpi/ic_action_send_now_away.png
index 505cbe63..505cbe63 100644
--- a/res/drawable-hdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_away.png
diff --git a/res/drawable-hdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
index a376524d..a376524d 100644
--- a/res/drawable-hdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-hdpi/ic_action_send_now_offline.png b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
index d4d2d510..d4d2d510 100644
--- a/res/drawable-hdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-hdpi/ic_action_send_now_online.png b/src/main/res/drawable-hdpi/ic_action_send_now_online.png
index 48676f7b..48676f7b 100644
--- a/res/drawable-hdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-hdpi/ic_action_send_now_online.png
diff --git a/res/drawable-hdpi/ic_activity.png b/src/main/res/drawable-hdpi/ic_activity.png
index 613da683..613da683 100644
--- a/res/drawable-hdpi/ic_activity.png
+++ b/src/main/res/drawable-hdpi/ic_activity.png
diff --git a/res/drawable-hdpi/ic_indicator.png b/src/main/res/drawable-hdpi/ic_indicator.png
index 6de8969f..6de8969f 100644
--- a/res/drawable-hdpi/ic_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_indicator.png
diff --git a/res/drawable-hdpi/ic_launcher.png b/src/main/res/drawable-hdpi/ic_launcher.png
index d48df2c3..d48df2c3 100644
--- a/res/drawable-hdpi/ic_launcher.png
+++ b/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/res/drawable-hdpi/ic_notification.png b/src/main/res/drawable-hdpi/ic_notification.png
index 664ba535..664ba535 100644
--- a/res/drawable-hdpi/ic_notification.png
+++ b/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/res/drawable-hdpi/ic_profile.png b/src/main/res/drawable-hdpi/ic_profile.png
index 3f071dec..3f071dec 100644
--- a/res/drawable-hdpi/ic_profile.png
+++ b/src/main/res/drawable-hdpi/ic_profile.png
diff --git a/res/drawable-hdpi/ic_received_indicator.png b/src/main/res/drawable-hdpi/ic_received_indicator.png
index b1e3f274..b1e3f274 100644
--- a/res/drawable-hdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_received_indicator.png
diff --git a/res/drawable-hdpi/ic_secure_indicator.png b/src/main/res/drawable-hdpi/ic_secure_indicator.png
index 2a2934fb..2a2934fb 100644
--- a/res/drawable-hdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-hdpi/ic_secure_indicator.png
diff --git a/res/drawable-hdpi/tab_selected_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
index b8f44c21..b8f44c21 100644
--- a/res/drawable-hdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_conversations.9.png
diff --git a/res/drawable-hdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
index 5512dbd3..5512dbd3 100644
--- a/res/drawable-hdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_focused_conversations.9.png
diff --git a/res/drawable-hdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
index e5f1df22..e5f1df22 100644
--- a/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_selected_pressed_conversations.9.png
diff --git a/res/drawable-hdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
index 7cd46d63..7cd46d63 100644
--- a/res/drawable-hdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_conversations.9.png
diff --git a/res/drawable-hdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
index 438ecdd8..438ecdd8 100644
--- a/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_focused_conversations.9.png
diff --git a/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
index 4f18a95a..4f18a95a 100644
--- a/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-hdpi/tab_unselected_pressed_conversations.9.png
diff --git a/res/drawable-mdpi/ic_action_add_group.png b/src/main/res/drawable-mdpi/ic_action_add_group.png
index 9a655899..9a655899 100644
--- a/res/drawable-mdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-mdpi/ic_action_add_group.png
diff --git a/res/drawable-mdpi/ic_action_add_person.png b/src/main/res/drawable-mdpi/ic_action_add_person.png
index b7d8f46a..b7d8f46a 100644
--- a/res/drawable-mdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-mdpi/ic_action_add_person.png
diff --git a/res/drawable-mdpi/ic_action_chat.png b/src/main/res/drawable-mdpi/ic_action_chat.png
index 8fdb5d75..8fdb5d75 100644
--- a/res/drawable-mdpi/ic_action_chat.png
+++ b/src/main/res/drawable-mdpi/ic_action_chat.png
diff --git a/res/drawable-mdpi/ic_action_copy.png b/src/main/res/drawable-mdpi/ic_action_copy.png
index 71348202..71348202 100644
--- a/res/drawable-mdpi/ic_action_copy.png
+++ b/src/main/res/drawable-mdpi/ic_action_copy.png
diff --git a/res/drawable-mdpi/ic_action_discard.png b/src/main/res/drawable-mdpi/ic_action_discard.png
index 248fb09c..248fb09c 100644
--- a/res/drawable-mdpi/ic_action_discard.png
+++ b/src/main/res/drawable-mdpi/ic_action_discard.png
diff --git a/res/drawable-mdpi/ic_action_edit.png b/src/main/res/drawable-mdpi/ic_action_edit.png
index 68a45320..68a45320 100644
--- a/res/drawable-mdpi/ic_action_edit.png
+++ b/src/main/res/drawable-mdpi/ic_action_edit.png
diff --git a/res/drawable-mdpi/ic_action_edit_dark.png b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
index 650b4d89..650b4d89 100644
--- a/res/drawable-mdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-mdpi/ic_action_edit_dark.png
diff --git a/res/drawable-mdpi/ic_action_group.png b/src/main/res/drawable-mdpi/ic_action_group.png
index 1ee3cccd..1ee3cccd 100644
--- a/res/drawable-mdpi/ic_action_group.png
+++ b/src/main/res/drawable-mdpi/ic_action_group.png
diff --git a/res/drawable-mdpi/ic_action_new.png b/src/main/res/drawable-mdpi/ic_action_new.png
index f17e7980..f17e7980 100644
--- a/res/drawable-mdpi/ic_action_new.png
+++ b/src/main/res/drawable-mdpi/ic_action_new.png
diff --git a/res/drawable-mdpi/ic_action_new_attachment.png b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
index 1d265aac..1d265aac 100644
--- a/res/drawable-mdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-mdpi/ic_action_new_attachment.png
diff --git a/res/drawable-mdpi/ic_action_not_secure.png b/src/main/res/drawable-mdpi/ic_action_not_secure.png
index faffa233..faffa233 100644
--- a/res/drawable-mdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-mdpi/ic_action_not_secure.png
diff --git a/res/drawable-mdpi/ic_action_refresh.png b/src/main/res/drawable-mdpi/ic_action_refresh.png
index de008e51..de008e51 100644
--- a/res/drawable-mdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-mdpi/ic_action_refresh.png
diff --git a/res/drawable-mdpi/ic_action_remove.png b/src/main/res/drawable-mdpi/ic_action_remove.png
index 342a79de..342a79de 100644
--- a/res/drawable-mdpi/ic_action_remove.png
+++ b/src/main/res/drawable-mdpi/ic_action_remove.png
diff --git a/res/drawable-mdpi/ic_action_search.png b/src/main/res/drawable-mdpi/ic_action_search.png
index 4edb1ff9..4edb1ff9 100644
--- a/res/drawable-mdpi/ic_action_search.png
+++ b/src/main/res/drawable-mdpi/ic_action_search.png
diff --git a/res/drawable-mdpi/ic_action_secure.png b/src/main/res/drawable-mdpi/ic_action_secure.png
index 05332ebf..05332ebf 100644
--- a/res/drawable-mdpi/ic_action_secure.png
+++ b/src/main/res/drawable-mdpi/ic_action_secure.png
diff --git a/res/drawable-mdpi/ic_action_send_now_away.png b/src/main/res/drawable-mdpi/ic_action_send_now_away.png
index 0fdca901..0fdca901 100644
--- a/res/drawable-mdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_away.png
diff --git a/res/drawable-mdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
index c0aef36c..c0aef36c 100644
--- a/res/drawable-mdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-mdpi/ic_action_send_now_offline.png b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
index 7723f4aa..7723f4aa 100644
--- a/res/drawable-mdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-mdpi/ic_action_send_now_online.png b/src/main/res/drawable-mdpi/ic_action_send_now_online.png
index 39d00ee4..39d00ee4 100644
--- a/res/drawable-mdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-mdpi/ic_action_send_now_online.png
diff --git a/res/drawable-mdpi/ic_activity.png b/src/main/res/drawable-mdpi/ic_activity.png
index c8727f57..c8727f57 100644
--- a/res/drawable-mdpi/ic_activity.png
+++ b/src/main/res/drawable-mdpi/ic_activity.png
diff --git a/res/drawable-mdpi/ic_indicator.png b/src/main/res/drawable-mdpi/ic_indicator.png
index bb4fee10..bb4fee10 100644
--- a/res/drawable-mdpi/ic_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_indicator.png
diff --git a/res/drawable-mdpi/ic_launcher.png b/src/main/res/drawable-mdpi/ic_launcher.png
index 200daf4c..200daf4c 100644
--- a/res/drawable-mdpi/ic_launcher.png
+++ b/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/res/drawable-mdpi/ic_notification.png b/src/main/res/drawable-mdpi/ic_notification.png
index 5d1aca10..5d1aca10 100644
--- a/res/drawable-mdpi/ic_notification.png
+++ b/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/res/drawable-mdpi/ic_profile.png b/src/main/res/drawable-mdpi/ic_profile.png
index 0d056c7c..0d056c7c 100644
--- a/res/drawable-mdpi/ic_profile.png
+++ b/src/main/res/drawable-mdpi/ic_profile.png
diff --git a/res/drawable-mdpi/ic_received_indicator.png b/src/main/res/drawable-mdpi/ic_received_indicator.png
index 88ff1efb..88ff1efb 100644
--- a/res/drawable-mdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_received_indicator.png
diff --git a/res/drawable-mdpi/ic_secure_indicator.png b/src/main/res/drawable-mdpi/ic_secure_indicator.png
index 5a73aef4..5a73aef4 100644
--- a/res/drawable-mdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-mdpi/ic_secure_indicator.png
diff --git a/res/drawable-mdpi/tab_selected_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
index 09d42dc8..09d42dc8 100644
--- a/res/drawable-mdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_conversations.9.png
diff --git a/res/drawable-mdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
index 20af01de..20af01de 100644
--- a/res/drawable-mdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_focused_conversations.9.png
diff --git a/res/drawable-mdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
index 13a878be..13a878be 100644
--- a/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_selected_pressed_conversations.9.png
diff --git a/res/drawable-mdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
index ad2dbae9..ad2dbae9 100644
--- a/res/drawable-mdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_conversations.9.png
diff --git a/res/drawable-mdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
index dfff5ac8..dfff5ac8 100644
--- a/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_focused_conversations.9.png
diff --git a/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
index 4365d178..4365d178 100644
--- a/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-mdpi/tab_unselected_pressed_conversations.9.png
diff --git a/res/drawable-xhdpi/ic_action_add_group.png b/src/main/res/drawable-xhdpi/ic_action_add_group.png
index c493aa5a..c493aa5a 100644
--- a/res/drawable-xhdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-xhdpi/ic_action_add_group.png
diff --git a/res/drawable-xhdpi/ic_action_add_person.png b/src/main/res/drawable-xhdpi/ic_action_add_person.png
index 4e8de1b6..4e8de1b6 100644
--- a/res/drawable-xhdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-xhdpi/ic_action_add_person.png
diff --git a/res/drawable-xhdpi/ic_action_chat.png b/src/main/res/drawable-xhdpi/ic_action_chat.png
index 8a9a4314..8a9a4314 100644
--- a/res/drawable-xhdpi/ic_action_chat.png
+++ b/src/main/res/drawable-xhdpi/ic_action_chat.png
diff --git a/res/drawable-xhdpi/ic_action_copy.png b/src/main/res/drawable-xhdpi/ic_action_copy.png
index 5ddf1513..5ddf1513 100644
--- a/res/drawable-xhdpi/ic_action_copy.png
+++ b/src/main/res/drawable-xhdpi/ic_action_copy.png
diff --git a/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png
index 9eeeed12..9eeeed12 100644
--- a/res/drawable-xhdpi/ic_action_discard.png
+++ b/src/main/res/drawable-xhdpi/ic_action_discard.png
diff --git a/res/drawable-xhdpi/ic_action_edit.png b/src/main/res/drawable-xhdpi/ic_action_edit.png
index 67e056fe..67e056fe 100644
--- a/res/drawable-xhdpi/ic_action_edit.png
+++ b/src/main/res/drawable-xhdpi/ic_action_edit.png
diff --git a/res/drawable-xhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
index 8ab436d8..8ab436d8 100644
--- a/res/drawable-xhdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-xhdpi/ic_action_edit_dark.png
diff --git a/res/drawable-xhdpi/ic_action_group.png b/src/main/res/drawable-xhdpi/ic_action_group.png
index fa2af497..fa2af497 100644
--- a/res/drawable-xhdpi/ic_action_group.png
+++ b/src/main/res/drawable-xhdpi/ic_action_group.png
diff --git a/res/drawable-xhdpi/ic_action_new.png b/src/main/res/drawable-xhdpi/ic_action_new.png
index dde2141f..dde2141f 100644
--- a/res/drawable-xhdpi/ic_action_new.png
+++ b/src/main/res/drawable-xhdpi/ic_action_new.png
diff --git a/res/drawable-xhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
index 41cbab20..41cbab20 100644
--- a/res/drawable-xhdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-xhdpi/ic_action_new_attachment.png
diff --git a/res/drawable-xhdpi/ic_action_not_secure.png b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
index c0902a03..c0902a03 100644
--- a/res/drawable-xhdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-xhdpi/ic_action_not_secure.png
diff --git a/res/drawable-xhdpi/ic_action_refresh.png b/src/main/res/drawable-xhdpi/ic_action_refresh.png
index cdc160d4..cdc160d4 100644
--- a/res/drawable-xhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xhdpi/ic_action_refresh.png
diff --git a/res/drawable-xhdpi/ic_action_remove.png b/src/main/res/drawable-xhdpi/ic_action_remove.png
index 58e2e3b4..58e2e3b4 100644
--- a/res/drawable-xhdpi/ic_action_remove.png
+++ b/src/main/res/drawable-xhdpi/ic_action_remove.png
diff --git a/res/drawable-xhdpi/ic_action_search.png b/src/main/res/drawable-xhdpi/ic_action_search.png
index 19658e4a..19658e4a 100644
--- a/res/drawable-xhdpi/ic_action_search.png
+++ b/src/main/res/drawable-xhdpi/ic_action_search.png
diff --git a/res/drawable-xhdpi/ic_action_secure.png b/src/main/res/drawable-xhdpi/ic_action_secure.png
index 4e08b95a..4e08b95a 100644
--- a/res/drawable-xhdpi/ic_action_secure.png
+++ b/src/main/res/drawable-xhdpi/ic_action_secure.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
index bb999d85..bb999d85 100644
--- a/res/drawable-xhdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_away.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
index a0bf5561..a0bf5561 100644
--- a/res/drawable-xhdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
index 6da9ff7b..6da9ff7b 100644
--- a/res/drawable-xhdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-xhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
index 348ba657..348ba657 100644
--- a/res/drawable-xhdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-xhdpi/ic_action_send_now_online.png
diff --git a/res/drawable-xhdpi/ic_activity.png b/src/main/res/drawable-xhdpi/ic_activity.png
index 95ffbecf..95ffbecf 100644
--- a/res/drawable-xhdpi/ic_activity.png
+++ b/src/main/res/drawable-xhdpi/ic_activity.png
diff --git a/res/drawable-xhdpi/ic_indicator.png b/src/main/res/drawable-xhdpi/ic_indicator.png
index 3e5141c2..3e5141c2 100644
--- a/res/drawable-xhdpi/ic_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_indicator.png
diff --git a/res/drawable-xhdpi/ic_launcher.png b/src/main/res/drawable-xhdpi/ic_launcher.png
index 927a2d2a..927a2d2a 100644
--- a/res/drawable-xhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/res/drawable-xhdpi/ic_notification.png b/src/main/res/drawable-xhdpi/ic_notification.png
index dfa643d0..dfa643d0 100644
--- a/res/drawable-xhdpi/ic_notification.png
+++ b/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/res/drawable-xhdpi/ic_profile.png b/src/main/res/drawable-xhdpi/ic_profile.png
index 88a82cf0..88a82cf0 100644
--- a/res/drawable-xhdpi/ic_profile.png
+++ b/src/main/res/drawable-xhdpi/ic_profile.png
diff --git a/res/drawable-xhdpi/ic_received_indicator.png b/src/main/res/drawable-xhdpi/ic_received_indicator.png
index 2c871933..2c871933 100644
--- a/res/drawable-xhdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_received_indicator.png
diff --git a/res/drawable-xhdpi/ic_secure_indicator.png b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
index 1f4c9a32..1f4c9a32 100644
--- a/res/drawable-xhdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-xhdpi/ic_secure_indicator.png
diff --git a/res/drawable-xhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
index 34eb4ec0..34eb4ec0 100644
--- a/res/drawable-xhdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_conversations.9.png
diff --git a/res/drawable-xhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
index 3155ef69..3155ef69 100644
--- a/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_focused_conversations.9.png
diff --git a/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
index 5c2440e4..5c2440e4 100644
--- a/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_selected_pressed_conversations.9.png
diff --git a/res/drawable-xhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
index e9ab742e..e9ab742e 100644
--- a/res/drawable-xhdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_conversations.9.png
diff --git a/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
index 42a2191e..42a2191e 100644
--- a/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_focused_conversations.9.png
diff --git a/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
index a5a2c25e..a5a2c25e 100644
--- a/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xhdpi/tab_unselected_pressed_conversations.9.png
diff --git a/res/drawable-xxhdpi/ic_action_add_group.png b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
index 2b46dbb9..2b46dbb9 100644
--- a/res/drawable-xxhdpi/ic_action_add_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_group.png
diff --git a/res/drawable-xxhdpi/ic_action_add_person.png b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
index e9a58eaf..e9a58eaf 100644
--- a/res/drawable-xxhdpi/ic_action_add_person.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_add_person.png
diff --git a/res/drawable-xxhdpi/ic_action_chat.png b/src/main/res/drawable-xxhdpi/ic_action_chat.png
index 04000fd0..04000fd0 100644
--- a/res/drawable-xxhdpi/ic_action_chat.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_chat.png
diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/src/main/res/drawable-xxhdpi/ic_action_copy.png
index a0508df8..a0508df8 100644
--- a/res/drawable-xxhdpi/ic_action_copy.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_copy.png
diff --git a/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
index cb1260a4..cb1260a4 100644
--- a/res/drawable-xxhdpi/ic_action_discard.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_discard.png
diff --git a/res/drawable-xxhdpi/ic_action_edit.png b/src/main/res/drawable-xxhdpi/ic_action_edit.png
index 3a241ea4..3a241ea4 100644
--- a/res/drawable-xxhdpi/ic_action_edit.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit.png
diff --git a/res/drawable-xxhdpi/ic_action_edit_dark.png b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
index f2b2078b..f2b2078b 100644
--- a/res/drawable-xxhdpi/ic_action_edit_dark.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_edit_dark.png
diff --git a/res/drawable-xxhdpi/ic_action_group.png b/src/main/res/drawable-xxhdpi/ic_action_group.png
index 9289b1c8..9289b1c8 100644
--- a/res/drawable-xxhdpi/ic_action_group.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_group.png
diff --git a/res/drawable-xxhdpi/ic_action_new.png b/src/main/res/drawable-xxhdpi/ic_action_new.png
index c42c2bfb..c42c2bfb 100644
--- a/res/drawable-xxhdpi/ic_action_new.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new.png
diff --git a/res/drawable-xxhdpi/ic_action_new_attachment.png b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
index ce7536cb..ce7536cb 100644
--- a/res/drawable-xxhdpi/ic_action_new_attachment.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_new_attachment.png
diff --git a/res/drawable-xxhdpi/ic_action_not_secure.png b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
index a186f1fb..a186f1fb 100644
--- a/res/drawable-xxhdpi/ic_action_not_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_not_secure.png
diff --git a/res/drawable-xxhdpi/ic_action_refresh.png b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
index cb847f37..cb847f37 100644
--- a/res/drawable-xxhdpi/ic_action_refresh.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_refresh.png
diff --git a/res/drawable-xxhdpi/ic_action_remove.png b/src/main/res/drawable-xxhdpi/ic_action_remove.png
index 331c545b..331c545b 100644
--- a/res/drawable-xxhdpi/ic_action_remove.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_remove.png
diff --git a/res/drawable-xxhdpi/ic_action_search.png b/src/main/res/drawable-xxhdpi/ic_action_search.png
index a1086388..a1086388 100644
--- a/res/drawable-xxhdpi/ic_action_search.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_search.png
diff --git a/res/drawable-xxhdpi/ic_action_secure.png b/src/main/res/drawable-xxhdpi/ic_action_secure.png
index ccf1fb00..ccf1fb00 100644
--- a/res/drawable-xxhdpi/ic_action_secure.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_secure.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_away.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
index 12ec4d33..12ec4d33 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_away.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_away.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_dnd.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
index 7719f81a..7719f81a 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_dnd.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_dnd.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_offline.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
index 18895813..18895813 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_offline.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_offline.png
diff --git a/res/drawable-xxhdpi/ic_action_send_now_online.png b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
index 29bde36e..29bde36e 100644
--- a/res/drawable-xxhdpi/ic_action_send_now_online.png
+++ b/src/main/res/drawable-xxhdpi/ic_action_send_now_online.png
diff --git a/res/drawable-xxhdpi/ic_activity.png b/src/main/res/drawable-xxhdpi/ic_activity.png
index 0b642d9b..0b642d9b 100644
--- a/res/drawable-xxhdpi/ic_activity.png
+++ b/src/main/res/drawable-xxhdpi/ic_activity.png
diff --git a/res/drawable-xxhdpi/ic_indicator.png b/src/main/res/drawable-xxhdpi/ic_indicator.png
index 2c51b8b7..2c51b8b7 100644
--- a/res/drawable-xxhdpi/ic_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_indicator.png
diff --git a/res/drawable-xxhdpi/ic_launcher.png b/src/main/res/drawable-xxhdpi/ic_launcher.png
index 65c1af34..65c1af34 100644
--- a/res/drawable-xxhdpi/ic_launcher.png
+++ b/src/main/res/drawable-xxhdpi/ic_launcher.png
diff --git a/res/drawable-xxhdpi/ic_notification.png b/src/main/res/drawable-xxhdpi/ic_notification.png
index ee1e9534..ee1e9534 100644
--- a/res/drawable-xxhdpi/ic_notification.png
+++ b/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/res/drawable-xxhdpi/ic_profile.png b/src/main/res/drawable-xxhdpi/ic_profile.png
index 309dc513..309dc513 100644
--- a/res/drawable-xxhdpi/ic_profile.png
+++ b/src/main/res/drawable-xxhdpi/ic_profile.png
diff --git a/res/drawable-xxhdpi/ic_received_indicator.png b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
index 039a9ef9..039a9ef9 100644
--- a/res/drawable-xxhdpi/ic_received_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_received_indicator.png
diff --git a/res/drawable-xxhdpi/ic_secure_indicator.png b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
index 1ee9b67d..1ee9b67d 100644
--- a/res/drawable-xxhdpi/ic_secure_indicator.png
+++ b/src/main/res/drawable-xxhdpi/ic_secure_indicator.png
diff --git a/res/drawable-xxhdpi/tab_selected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
index e4439e7c..e4439e7c 100644
--- a/res/drawable-xxhdpi/tab_selected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
index dd2ded89..dd2ded89 100644
--- a/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_focused_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
index 58c8a576..58c8a576 100644
--- a/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_selected_pressed_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
index 566062f0..566062f0 100644
--- a/res/drawable-xxhdpi/tab_unselected_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
index 432e68c4..432e68c4 100644
--- a/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_focused_conversations.9.png
diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
index 8dd01d5c..8dd01d5c 100644
--- a/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
+++ b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_conversations.9.png
diff --git a/res/drawable/actionbar_tab_indicator.xml b/src/main/res/drawable/actionbar_tab_indicator.xml
index 5598ee42..5598ee42 100644
--- a/res/drawable/actionbar_tab_indicator.xml
+++ b/src/main/res/drawable/actionbar_tab_indicator.xml
diff --git a/res/drawable/es_slidingpane_shadow.xml b/src/main/res/drawable/es_slidingpane_shadow.xml
index 44ffd4ea..44ffd4ea 100644
--- a/res/drawable/es_slidingpane_shadow.xml
+++ b/src/main/res/drawable/es_slidingpane_shadow.xml
diff --git a/res/drawable/grey.xml b/src/main/res/drawable/grey.xml
index 2e90d96d..2e90d96d 100644
--- a/res/drawable/grey.xml
+++ b/src/main/res/drawable/grey.xml
diff --git a/res/drawable/greybackground.xml b/src/main/res/drawable/greybackground.xml
index bedc4b17..bedc4b17 100644
--- a/res/drawable/greybackground.xml
+++ b/src/main/res/drawable/greybackground.xml
diff --git a/res/drawable/infocard_border.xml b/src/main/res/drawable/infocard_border.xml
index 7c7ded57..7c7ded57 100644
--- a/res/drawable/infocard_border.xml
+++ b/src/main/res/drawable/infocard_border.xml
diff --git a/res/drawable/message_border.xml b/src/main/res/drawable/message_border.xml
index b463d788..b463d788 100644
--- a/res/drawable/message_border.xml
+++ b/src/main/res/drawable/message_border.xml
diff --git a/res/drawable/snackbar.xml b/src/main/res/drawable/snackbar.xml
index 951d7aee..951d7aee 100644
--- a/res/drawable/snackbar.xml
+++ b/src/main/res/drawable/snackbar.xml
diff --git a/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
index a600118d..a600118d 100644
--- a/res/layout-w360dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
diff --git a/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
index c3aa67ae..c3aa67ae 100644
--- a/res/layout-w384dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
diff --git a/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
index 331fb1f0..331fb1f0 100644
--- a/res/layout-w600dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
diff --git a/res/layout-w960dp/fragment_conversations_overview.xml b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
index 2744f38e..2744f38e 100644
--- a/res/layout-w960dp/fragment_conversations_overview.xml
+++ b/src/main/res/layout-w960dp/fragment_conversations_overview.xml
diff --git a/res/layout/account_row.xml b/src/main/res/layout/account_row.xml
index 2d1190a3..2d1190a3 100644
--- a/res/layout/account_row.xml
+++ b/src/main/res/layout/account_row.xml
diff --git a/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml
index 64b75f0e..64b75f0e 100644
--- a/res/layout/actionview_search.xml
+++ b/src/main/res/layout/actionview_search.xml
diff --git a/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml
index 248a7822..248a7822 100644
--- a/res/layout/activity_choose_contact.xml
+++ b/src/main/res/layout/activity_choose_contact.xml
diff --git a/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index f7cb2198..f7cb2198 100644
--- a/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
diff --git a/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 97289628..97289628 100644
--- a/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
diff --git a/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index f689f10d..f689f10d 100644
--- a/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
diff --git a/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index fac499bc..fac499bc 100644
--- a/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
diff --git a/res/layout/activity_start_conversation.xml b/src/main/res/layout/activity_start_conversation.xml
index f9c98529..f9c98529 100644
--- a/res/layout/activity_start_conversation.xml
+++ b/src/main/res/layout/activity_start_conversation.xml
diff --git a/res/layout/contact.xml b/src/main/res/layout/contact.xml
index 12ab3da1..12ab3da1 100644
--- a/res/layout/contact.xml
+++ b/src/main/res/layout/contact.xml
diff --git a/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 7053857f..7053857f 100644
--- a/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
diff --git a/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml
index 21147b4a..21147b4a 100644
--- a/res/layout/conversation_list_row.xml
+++ b/src/main/res/layout/conversation_list_row.xml
diff --git a/res/layout/create_contact_dialog.xml b/src/main/res/layout/create_contact_dialog.xml
index 1ab4b686..1ab4b686 100644
--- a/res/layout/create_contact_dialog.xml
+++ b/src/main/res/layout/create_contact_dialog.xml
diff --git a/res/layout/dialog_clear_history.xml b/src/main/res/layout/dialog_clear_history.xml
index 252808c8..252808c8 100644
--- a/res/layout/dialog_clear_history.xml
+++ b/src/main/res/layout/dialog_clear_history.xml
diff --git a/res/layout/dialog_verify_otr.xml b/src/main/res/layout/dialog_verify_otr.xml
index 499ef6cd..499ef6cd 100644
--- a/res/layout/dialog_verify_otr.xml
+++ b/src/main/res/layout/dialog_verify_otr.xml
diff --git a/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index f9aae10a..f9aae10a 100644
--- a/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
diff --git a/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index d4145761..d4145761 100644
--- a/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
diff --git a/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 95c9d24c..95c9d24c 100644
--- a/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
diff --git a/res/layout/manage_accounts.xml b/src/main/res/layout/manage_accounts.xml
index 11ce35b2..11ce35b2 100644
--- a/res/layout/manage_accounts.xml
+++ b/src/main/res/layout/manage_accounts.xml
diff --git a/res/layout/message_null.xml b/src/main/res/layout/message_null.xml
index 0e0f1c92..0e0f1c92 100644
--- a/res/layout/message_null.xml
+++ b/src/main/res/layout/message_null.xml
diff --git a/res/layout/message_received.xml b/src/main/res/layout/message_received.xml
index 39bb842a..39bb842a 100644
--- a/res/layout/message_received.xml
+++ b/src/main/res/layout/message_received.xml
diff --git a/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index 3e854643..3e854643 100644
--- a/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
diff --git a/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index d5f8bb33..d5f8bb33 100644
--- a/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
diff --git a/res/layout/quickedit.xml b/src/main/res/layout/quickedit.xml
index 20a2868a..20a2868a 100644
--- a/res/layout/quickedit.xml
+++ b/src/main/res/layout/quickedit.xml
diff --git a/res/layout/share_with.xml b/src/main/res/layout/share_with.xml
index 41b6033d..41b6033d 100644
--- a/res/layout/share_with.xml
+++ b/src/main/res/layout/share_with.xml
diff --git a/res/menu/attachment_choices.xml b/src/main/res/menu/attachment_choices.xml
index 20932489..20932489 100644
--- a/res/menu/attachment_choices.xml
+++ b/src/main/res/menu/attachment_choices.xml
diff --git a/res/menu/choose_contact.xml b/src/main/res/menu/choose_contact.xml
index e39091b3..e39091b3 100644
--- a/res/menu/choose_contact.xml
+++ b/src/main/res/menu/choose_contact.xml
diff --git a/res/menu/conference_context.xml b/src/main/res/menu/conference_context.xml
index fd898580..fd898580 100644
--- a/res/menu/conference_context.xml
+++ b/src/main/res/menu/conference_context.xml
diff --git a/res/menu/contact_context.xml b/src/main/res/menu/contact_context.xml
index 11ac7d7c..11ac7d7c 100644
--- a/res/menu/contact_context.xml
+++ b/src/main/res/menu/contact_context.xml
diff --git a/res/menu/contact_details.xml b/src/main/res/menu/contact_details.xml
index 02f2e813..02f2e813 100644
--- a/res/menu/contact_details.xml
+++ b/src/main/res/menu/contact_details.xml
diff --git a/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index 3edee120..3edee120 100644
--- a/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
diff --git a/res/menu/encryption_choices.xml b/src/main/res/menu/encryption_choices.xml
index adf0ad8d..adf0ad8d 100644
--- a/res/menu/encryption_choices.xml
+++ b/src/main/res/menu/encryption_choices.xml
diff --git a/res/menu/manageaccounts.xml b/src/main/res/menu/manageaccounts.xml
index b5cd9b50..b5cd9b50 100644
--- a/res/menu/manageaccounts.xml
+++ b/src/main/res/menu/manageaccounts.xml
diff --git a/res/menu/manageaccounts_context.xml b/src/main/res/menu/manageaccounts_context.xml
index 7a7cc0a2..7a7cc0a2 100644
--- a/res/menu/manageaccounts_context.xml
+++ b/src/main/res/menu/manageaccounts_context.xml
diff --git a/res/menu/message_context.xml b/src/main/res/menu/message_context.xml
index 80d4d196..80d4d196 100644
--- a/res/menu/message_context.xml
+++ b/src/main/res/menu/message_context.xml
diff --git a/res/menu/muc_details.xml b/src/main/res/menu/muc_details.xml
index 97369098..97369098 100644
--- a/res/menu/muc_details.xml
+++ b/src/main/res/menu/muc_details.xml
diff --git a/res/menu/share_with.xml b/src/main/res/menu/share_with.xml
index cbd15c11..cbd15c11 100644
--- a/res/menu/share_with.xml
+++ b/src/main/res/menu/share_with.xml
diff --git a/res/menu/start_conversation.xml b/src/main/res/menu/start_conversation.xml
index f7230169..f7230169 100644
--- a/res/menu/start_conversation.xml
+++ b/src/main/res/menu/start_conversation.xml
diff --git a/res/values-ca/arrays.xml b/src/main/res/values-ca/arrays.xml
index ff1a0d4b..ff1a0d4b 100644
--- a/res/values-ca/arrays.xml
+++ b/src/main/res/values-ca/arrays.xml
diff --git a/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index cfbe428b..cfbe428b 100644
--- a/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
diff --git a/res/values-cs/arrays.xml b/src/main/res/values-cs/arrays.xml
index 4510cf84..4510cf84 100644
--- a/res/values-cs/arrays.xml
+++ b/src/main/res/values-cs/arrays.xml
diff --git a/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 6c68fe75..6c68fe75 100644
--- a/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
diff --git a/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml
index ed5d47b5..ed5d47b5 100644
--- a/res/values-de/arrays.xml
+++ b/src/main/res/values-de/arrays.xml
diff --git a/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index ca190deb..ca190deb 100644
--- a/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
diff --git a/res/values-es/arrays.xml b/src/main/res/values-es/arrays.xml
index 15231955..15231955 100644
--- a/res/values-es/arrays.xml
+++ b/src/main/res/values-es/arrays.xml
diff --git a/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 47424d00..47424d00 100644
--- a/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
diff --git a/res/values-eu/arrays.xml b/src/main/res/values-eu/arrays.xml
index a34d3c6a..a34d3c6a 100644
--- a/res/values-eu/arrays.xml
+++ b/src/main/res/values-eu/arrays.xml
diff --git a/res/values-eu/strings.xml b/src/main/res/values-eu/strings.xml
index 8896e9b5..8896e9b5 100644
--- a/res/values-eu/strings.xml
+++ b/src/main/res/values-eu/strings.xml
diff --git a/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml
index ae140796..ae140796 100644
--- a/res/values-fr/arrays.xml
+++ b/src/main/res/values-fr/arrays.xml
diff --git a/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e1db316d..e1db316d 100644
--- a/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
diff --git a/res/values-gl/arrays.xml b/src/main/res/values-gl/arrays.xml
index 19424a78..19424a78 100644
--- a/res/values-gl/arrays.xml
+++ b/src/main/res/values-gl/arrays.xml
diff --git a/res/values-gl/strings.xml b/src/main/res/values-gl/strings.xml
index 58116463..58116463 100644
--- a/res/values-gl/strings.xml
+++ b/src/main/res/values-gl/strings.xml
diff --git a/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml
index 491c4438..491c4438 100644
--- a/res/values-it/arrays.xml
+++ b/src/main/res/values-it/arrays.xml
diff --git a/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 0bb0e05e..0bb0e05e 100644
--- a/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
diff --git a/res/values-iw/arrays.xml b/src/main/res/values-iw/arrays.xml
index 28768d6c..28768d6c 100644
--- a/res/values-iw/arrays.xml
+++ b/src/main/res/values-iw/arrays.xml
diff --git a/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index fd8eaa0b..fd8eaa0b 100644
--- a/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
diff --git a/res/values-nl/arrays.xml b/src/main/res/values-nl/arrays.xml
index 9ced79f4..9ced79f4 100644
--- a/res/values-nl/arrays.xml
+++ b/src/main/res/values-nl/arrays.xml
diff --git a/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 7b3faca9..7b3faca9 100644
--- a/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
diff --git a/res/values-ru/arrays.xml b/src/main/res/values-ru/arrays.xml
index d01d4eb9..d01d4eb9 100644
--- a/res/values-ru/arrays.xml
+++ b/src/main/res/values-ru/arrays.xml
diff --git a/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2aa26b0b..2aa26b0b 100644
--- a/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
diff --git a/res/values-sv/arrays.xml b/src/main/res/values-sv/arrays.xml
index 890e2915..890e2915 100644
--- a/res/values-sv/arrays.xml
+++ b/src/main/res/values-sv/arrays.xml
diff --git a/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index a3ed9112..a3ed9112 100644
--- a/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
diff --git a/res/values-zh-rCN/arrays.xml b/src/main/res/values-zh-rCN/arrays.xml
index 1a243079..1a243079 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/src/main/res/values-zh-rCN/arrays.xml
diff --git a/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a7898425..a7898425 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
diff --git a/res/values-zh-rTW/arrays.xml b/src/main/res/values-zh-rTW/arrays.xml
index b9c261ad..b9c261ad 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/src/main/res/values-zh-rTW/arrays.xml
diff --git a/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 2c3ea225..2c3ea225 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
diff --git a/res/values/arrays.xml b/src/main/res/values/arrays.xml
index 4acc9e62..4acc9e62 100644
--- a/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
diff --git a/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2354a5e8..2354a5e8 100644
--- a/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
diff --git a/res/values/colors.xml b/src/main/res/values/colors.xml
index 908b8b89..908b8b89 100644
--- a/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml
index e941ed6d..e941ed6d 100644
--- a/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
diff --git a/res/values/styles.xml b/src/main/res/values/styles.xml
index 64bde770..64bde770 100644
--- a/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
diff --git a/res/values/themes.xml b/src/main/res/values/themes.xml
index fa7973d2..fa7973d2 100644
--- a/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
diff --git a/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 06ab7560..06ab7560 100644
--- a/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml