Update translations

24 files changed, 2207 insertions, 1920 deletions

diff --git a/main/po/ar.po b/main/po/ar.po
index 2ed830fd..dcfd28e8 100644
--- a/main/po/ar.po
+++ b/main/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-30 16:09+0000\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/dino/translations/"
 "ar/>\n"
@@ -20,40 +20,40 @@ msgstr ""
 "X-Generator: Weblate 3.5-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "تم إرسال الصورة"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "تم إرسال الملف"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "تم استلام الصورة"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "تم استلام الملف"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "طلب اشتراك"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "قبول"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "رفض"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "فشل الاتصال بـ %s"
@@ -77,7 +77,8 @@ msgstr "اختيار"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -165,38 +166,38 @@ msgstr "إنشاء حساب"
 msgid "Check %s for information on how to sign up"
 msgstr "إطّلع على %s للمزيد من المعلومات حول التسجيل"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "أنا"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "البارحة"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
@@ -207,8 +208,8 @@ msgstr[3] "منذ %i د"
 msgstr[4] "منذ %i دقائق"
 msgstr[5] "منذ %i دقيقة"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "الآن"
 
@@ -217,8 +218,9 @@ msgid "Join Conference"
 msgstr "الإنضمام إلى فريق محادثة"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "إنضمّ"
 
@@ -232,76 +234,85 @@ msgid "Save"
 msgstr "حفظ"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "الإلتحاق بقناة"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "التالي"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "العودة"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "الشروع في محادثة"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "إبدأ"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "في طريق الإلتحاق …"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "كلمة السر مطلوبة للدخول إلى غرفة المحادثة"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "محظور مِن الإنضمام أو إنشاء فِرَق محادثة"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "غرفة المحادثة غير موجودة"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "ليس لديك تسريح لإنشاء غرفة محادثة"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "الغرفة خاصة بأعضائها فقط"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "إختر إسما مستعارا آخر"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "غرفة المحادثة مكتضة"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "مرحبا بكم على دينو!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "تهيئة الحساب"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "ليس هناك أية حسابات نشطة"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "إدارة الحسابات"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "ليس هناك أية محادثات نشطة"
 
@@ -346,7 +357,7 @@ msgstr "توقفَ عن الكتابة"
 msgid "Message too long"
 msgstr "الرسالة طويلة جدًا"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "ملف"
 
@@ -354,32 +365,32 @@ msgstr "ملف"
 msgid "This contact would like to add you to their contact list"
 msgstr "يريد هذا المراسل إضافتك إلى قائمة مراسليه"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -514,9 +525,7 @@ msgid "Room Configuration"
 msgstr "إعدادات الغرفة"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "الإعدادات"
@@ -529,47 +538,55 @@ msgstr "حظر"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "تم حظر الإتصال وتحديثات الحالة في كلا الإتجاهين"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "الإعدادات المحلية"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "إرسال إشعارات عند الكتابة"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "إرسال إيصالات القراءة"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "الإشعارات"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "الإعدادات المحلية"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "نشط"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "معطّل"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "فقط عندما يُشار إليّ"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "إفتراضي: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "الإشعار عند تلقي رسائل جديدة"
@@ -607,11 +624,6 @@ msgstr "إنشاء حساب"
 msgid "Could not establish a secure connection"
 msgstr "لا يمكن إنشاء اتصال آمن"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "العودة"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "اتصل"
diff --git a/main/po/ca.po b/main/po/ca.po
index 985726cb..19b613b9 100644
--- a/main/po/ca.po
+++ b/main/po/ca.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino 20180510\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2018-05-10 14:38+0200\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/dino/"
 "translations/ca/>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "X-Generator: Weblate 2.19-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr ""
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Petició de subscripció"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Acepta"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rebutja"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -74,7 +74,8 @@ msgstr "Selecciona"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -162,46 +163,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Jo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ahir"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H.%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l.%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "fa %i minut"
 msgstr[1] "fa %i minuts"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Ara mateix"
 
@@ -210,8 +211,9 @@ msgid "Join Conference"
 msgstr "Uneix-te a la conferència"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Uneix-te"
 
@@ -225,76 +227,85 @@ msgid "Save"
 msgstr "Desa"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Següent"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Inicia"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "S'està unint…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Es requereix una contrasenya per entrar a la sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Heu estat bandejat de unir-vos o crear conferències"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "La sala no existeix"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "No esteu autoritzat a crear una sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Sala només per membres"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Seleccioneu un sobrenom diferent"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Massa ocupants a la sala"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "No hi ha cap compte actiu"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Gestiona els comptes"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Cap conversa activa"
 
@@ -335,7 +346,7 @@ msgstr "ha parat d'escriure"
 msgid "Message too long"
 msgstr "El missatge és massa llarg"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fitxer"
 
@@ -343,32 +354,32 @@ msgstr "Fitxer"
 msgid "This contact would like to add you to their contact list"
 msgstr "Aquest contacte vol afegir-vos a la seva llista de contactes"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H.%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l.%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H.%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l.%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H.%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l.%M %p"
@@ -503,9 +514,7 @@ msgid "Room Configuration"
 msgstr "Configuració de la sala"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Preferències"
@@ -519,47 +528,55 @@ msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "La comunicació i actualitzacions d'estat en ambdúes direccions estan blocades"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Preferències locals"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Envia notificacions de tecleig"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Envia rebuts de lectura"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notificacions"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Preferències locals"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Habilitat"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Inhabilitat"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Només quan rebeu una menció"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Per defecte: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifica'm quan arriba un missatge nou"
@@ -597,11 +614,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/de.po b/main/po/de.po
index 3b504285..395af273 100644
--- a/main/po/de.po
+++ b/main/po/de.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
-"PO-Revision-Date: 2019-02-08 05:09+0000\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
+"PO-Revision-Date: 2019-05-17 16:48+0000\n"
 "Language-Team: German <https://hosted.weblate.org/projects/dino/translations/"
 "de/>\n"
 "Language: de\n"
@@ -11,43 +11,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.5-dev\n"
+"X-Generator: Weblate 3.7-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Bild gesendet"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Datei gesendet"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Bild empfangen"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Datei empfangen"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Kontaktanfrage"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Annehmen"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Verbindung zu %s fehlgeschlagen"
@@ -71,7 +71,8 @@ msgstr "Auswählen"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -159,46 +160,46 @@ msgstr "Registrieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Eventuell sind auf %s Informationen zur Registrierung zu finden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ich"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gestern"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "vor %i min"
 msgstr[1] "vor %i min"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Gerade eben"
 
@@ -207,8 +208,9 @@ msgid "Join Conference"
 msgstr "Konferenz beitreten"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Beitreten"
 
@@ -222,76 +224,85 @@ msgid "Save"
 msgstr "Speichern"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Kanal beitreten"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Weiter"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Zurück"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Unterhaltung starten"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Starten"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Beitreten…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Raum erfordert Passwort"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Beitreten oder erstellen der Konferenz verboten"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Raum existiert nicht"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Raum erzeugen verboten"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
-msgstr "Raum nur für Mittglieder"
+msgstr "Raum nur für Mitglieder"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Wähle einen anderen Spitznamen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Zu viele Nutzer im Raum"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Willkommen bei Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Konto einrichten"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Keine Konten aktiv"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Konten verwalten"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Keine Unterhaltung aktiv"
 
@@ -332,7 +343,7 @@ msgstr "hat aufgehört zu tippen"
 msgid "Message too long"
 msgstr "Nachricht zu lang"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Datei"
 
@@ -340,32 +351,32 @@ msgstr "Datei"
 msgid "This contact would like to add you to their contact list"
 msgstr "Dieser Kontakt will dich zu seiner Kontaktliste hinzufügen"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d. %b, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d. %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -501,9 +512,7 @@ msgid "Room Configuration"
 msgstr "Raum Konfiguration"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Einstellungen"
@@ -517,47 +526,55 @@ msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "Kommunikation und Statusaktualisierungen sind in beide Richtungen blockiert"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale Einstellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Tippbenachrichtigungen senden"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Lesebestätigungen senden"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale Einstellungen"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "An"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Aus"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Nur bei Erwähnung"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Standard: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benachrichtigen bei Empfang einer neuen Nachricht"
@@ -595,11 +612,6 @@ msgstr "Konto erstellen"
 msgid "Could not establish a secure connection"
 msgstr "Es konnte keine sichere Verbindung hergestellt werden"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Zurück"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Verbinden"
diff --git a/main/po/dino.pot b/main/po/dino.pot
index 5d562bfc..65116d46 100644
--- a/main/po/dino.pot
+++ b/main/po/dino.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr ""
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -76,7 +76,8 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr ""
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr ""
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr ""
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr ""
 
@@ -337,7 +348,7 @@ msgstr ""
 msgid "Message too long"
 msgstr ""
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr ""
 
@@ -345,32 +356,32 @@ msgstr ""
 msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr ""
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr ""
@@ -520,47 +529,55 @@ msgstr ""
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr ""
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
@@ -598,11 +615,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/en.po b/main/po/en.po
index 525fdd0b..ceefe2ec 100644
--- a/main/po/en.po
+++ b/main/po/en.po
@@ -2,47 +2,47 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino-0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr ""
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -66,7 +66,8 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -154,46 +155,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr ""
 
@@ -202,8 +203,9 @@ msgid "Join Conference"
 msgstr ""
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr ""
 
@@ -217,76 +219,85 @@ msgid "Save"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr ""
 
@@ -327,7 +338,7 @@ msgstr ""
 msgid "Message too long"
 msgstr ""
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr ""
 
@@ -335,32 +346,32 @@ msgstr ""
 msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
@@ -495,9 +506,7 @@ msgid "Room Configuration"
 msgstr ""
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr ""
@@ -510,47 +519,55 @@ msgstr ""
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr ""
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
@@ -588,11 +605,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/eo.po b/main/po/eo.po
index b340cc50..9f632041 100644
--- a/main/po/eo.po
+++ b/main/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-19 14:20+0000\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/dino/"
 "translations/eo/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Bildon sendis"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Dosieron sendis"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Bildon ricevis"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Dosieron ricevis"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Abona peto"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akcepti"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Malsukcesis konektanta al %s"
@@ -76,7 +76,8 @@ msgstr "Elekti"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Hieraŭ"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "Antaŭ %i minuto"
 msgstr[1] "Antaŭ %i minutoj"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Ĵus"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Aliĝi al Kunveno"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Aliĝi"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Konservi"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Sekva"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Neniuj aktivaj kontoj"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Administri kontojn"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Neniu aktiva interparolo"
 
@@ -338,7 +349,7 @@ msgstr "ĉesis tajpi"
 msgid "Message too long"
 msgstr ""
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr ""
 
@@ -346,32 +357,32 @@ msgstr ""
 msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -506,9 +517,7 @@ msgid "Room Configuration"
 msgstr "Ĉambraj Agordoj"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Agordoj"
@@ -521,47 +530,55 @@ msgstr ""
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokaj Agordoj"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Sciigi pri tajpado"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Sciigoj"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokaj Agordoj"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Ek"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "For"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Nur menciite"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Sciigi pri envenaj mesaĝoj"
@@ -599,11 +616,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/es.po b/main/po/es.po
index b20dad9b..d9501f43 100644
--- a/main/po/es.po
+++ b/main/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-05 11:06+0000\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/dino/"
 "translations/es/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Imagen enviada"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Archivo enviado"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Imagen recibida"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Archivo recibido"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Solicitud de suscripción"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceptar"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Denegar"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Fallo conectando con %s"
@@ -76,7 +76,8 @@ msgstr "Seleccionar"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Registro"
 msgid "Check %s for information on how to sign up"
 msgstr "Mira %s para mas información sobre el registro"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Yo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ayer"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "hace %i min"
 msgstr[1] "hace %i mins"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Ahora"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Unirse a Conversación en grupo"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Unirse"
 
@@ -227,77 +229,86 @@ msgid "Save"
 msgstr "Guardar"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Unirse a Conversación en grupo"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Siguiente"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Volver"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Iniciar Conversación"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Iniciar"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Uniéndose…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Contraseña requerida para entrar en la conversación en grupo"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr ""
 "Tu entrada ha sido prohibida o no puedes crear la conversación en grupo"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "La conversación en grupo no existe"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "No está permitido crear la conversación en grupo"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "La conversación es solo para miembros"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Elige un alias diferente"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "La conversación tiene demasiados ocupantes"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "¡Bienvenido a Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configurar cuenta"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "No hay cuentas activas"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Gestionar cuentas"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "No hay conversaciones activa"
 
@@ -338,7 +349,7 @@ msgstr "ha dejado de escribir"
 msgid "Message too long"
 msgstr "Mensaje demasiado largo"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Archivo"
 
@@ -346,32 +357,32 @@ msgstr "Archivo"
 msgid "This contact would like to add you to their contact list"
 msgstr "A este contacto le gustaría añadirte a su lista de contactos"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -508,9 +519,7 @@ msgid "Room Configuration"
 msgstr "Configuración de la conversación en grupo"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Ajustes"
@@ -523,47 +532,55 @@ msgstr "Bloquear"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Las comunicaciones y las actualizaciones de presencia serán bloqueadas"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Ajustes locales"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Enviar notificaciones cuando escribes"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Enviar confirmaciones de lectura"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Ajustes locales"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Sí"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "No"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Solo cuando te mencionan en la conversación"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Por defecto: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar cuando llega un nuevo mensaje"
@@ -601,11 +618,6 @@ msgstr "Crear cuenta"
 msgid "Could not establish a secure connection"
 msgstr "No se pudo establecer una conexión segura"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Volver"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Conectar"
diff --git a/main/po/eu.po b/main/po/eu.po
index 25f96869..8ed7c222 100644
--- a/main/po/eu.po
+++ b/main/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-05 11:06+0000\n"
 "Language-Team: Basque <https://hosted.weblate.org/projects/dino/translations/"
 "eu/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Irudia bidali da"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Fitxategia bidali da"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Irudia jaso da"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Fitxategia jaso da"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Harpidetzaren eskaera"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Onartu"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Ukatu"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Huts %s(e)ra konektatzerakoan"
@@ -76,7 +76,8 @@ msgstr "Hautatu"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Izena eman"
 msgid "Check %s for information on how to sign up"
 msgstr "Ikusi %s izena ematearen inguruko informazioa lortzeko"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ni"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Atzo"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "orain dela min %i"
 msgstr[1] "orain dela %i min"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Orain"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Konferentziara batu"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Batu"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Gorde"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Kanalera gehitu"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Atzera"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Elkarrizketa hasi"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Hasi"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Batzen…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Pasahitza behar da gelara sartzeko"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Konferentzia sortu edo batzea debekatuta"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Gela ez da existitzen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Ez duzu gela sortzeko baimenik"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Gela kideentzat da soilik"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Ezizen ezberdin bat hautatu"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Gelak kide gehiegi ditu"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Ongi etorri Dinora!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Kontu bat ezarri"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Ez dago kontu aktiborik"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Kontuak kudeatu"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Ez dago solasaldi aktiborik"
 
@@ -337,7 +348,7 @@ msgstr "idazteari utzi dio"
 msgid "Message too long"
 msgstr "Mezu luzeegia"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fitxategia"
 
@@ -345,32 +356,32 @@ msgstr "Fitxategia"
 msgid "This contact would like to add you to their contact list"
 msgstr "Kontaktu honek bere kontaktuen zerrendara gehitu nahi zaitu"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -506,9 +517,7 @@ msgid "Room Configuration"
 msgstr "Gelaren konfigurazioa"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Ezarpenak"
@@ -522,47 +531,55 @@ msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "Komunikazioa eta egoeraren eguneraketak edozein norabideetan blokeatuta daude"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Bertako ezarpenak"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Idazte jakinarazpenak bidali"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Bidali irakurtze baieztapena"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Jakinarazpenak"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Bertako ezarpenak"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Piztuta"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Itzalita"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Soilik aipatua izaterakoan"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Lehenetsia: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Mezu berri bat heltzerakoan jakinarazi"
@@ -600,11 +617,6 @@ msgstr "Kontua sortu"
 msgid "Could not establish a secure connection"
 msgstr "Ezin izan da konexio seguru bat ezarri"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Atzera"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Konektatu"
diff --git a/main/po/fi.po b/main/po/fi.po
index dc4e4c10..c8411997 100644
--- a/main/po/fi.po
+++ b/main/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2018-05-13 10:18+0000\n"
 "Language-Team: Finnish <https://hosted.weblate.org/projects/dino/"
 "translations/fi/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.0-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr ""
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Yhteyspyyntö"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Hylkää"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -76,7 +76,8 @@ msgstr "Valitse"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Minä"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d. %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Eilen"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min sitten"
 msgstr[1] "%i min sitten"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Juuri nyt"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Liity ryhmäkeskusteluun"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Liity"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Tallenna"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Liity kanavalle"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Seuraava"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Aloita keskustelu"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Aloita"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Yhdistää…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Huoneeseen vaaditaan salasana"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Estetty liittymästä tai luomasta ryhmäkeskustelua"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Huonetta ei ole olemassa"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Huoneen luomista ei sallita"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Huone vain jäsenille"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Valitse jokin muu nimimerkki"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Liikaa käyttäjiä huoneessa"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Ei aktiivisia tilejä"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Hallitse tilejä"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Ei aktiivisia keskusteluja"
 
@@ -337,7 +348,7 @@ msgstr "on lakannut kirjoittamasta"
 msgid "Message too long"
 msgstr "Viesti liian pitkä"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Tiedosto"
 
@@ -345,32 +356,32 @@ msgstr "Tiedosto"
 msgid "This contact would like to add you to their contact list"
 msgstr "Tämä käyttäjä haluaisi lisätä sinut yhteystietoihinsa"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d. %b, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d. %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Huoneen asetukset"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Asetukset"
@@ -520,47 +529,55 @@ msgstr "Estä"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Viestit ja tilapäivitykset estetään molempiin suuntiin"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Paikalliset asetukset"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Lähetä kirjoittamisilmoitukset"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Lähetä lukukuittaukset"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Ilmoitukset"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Paikalliset asetukset"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Käytössä"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Pois"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Vain mainittaessa"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Oletus: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Ilmoita kun uusi viesti saapuu"
@@ -598,11 +615,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/fr.po b/main/po/fr.po
index d647dcfe..c104b80d 100644
--- a/main/po/fr.po
+++ b/main/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-19 14:20+0000\n"
 "Language-Team: French <https://hosted.weblate.org/projects/dino/translations/"
 "fr/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Image envoyée"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Fichier envoyé"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Image reçue"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Fichier reçu"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Demande d’abonnement"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accepter"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Refuser"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Échec de la connexion à %s"
@@ -76,7 +76,8 @@ msgstr "Choisir"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "S’inscrire"
 msgid "Check %s for information on how to sign up"
 msgstr "Consultez %s pour plus d’informations sur comment s’inscrire"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Moi"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Hier"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hh%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "Il y a %i minute"
 msgstr[1] "Il y a %i minutes"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "À l’instant"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Rejoindre une conférence"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Rejoindre"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Sauver"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Rejoindre un salon"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Suivant"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Retour"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Commencer une discussion"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Démarrer"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Connexion au salon…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Mot de passe nécessaire pour rejoindre ce salon"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Vous êtes bannis pour la création ou connexion à ce salon"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Ce salon n’existe pas"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Création de salon interdite"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Salon réservé aux membres"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Choisissez un autre pseudo"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Trop de participants dans ce salon"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Bienvenue dans Dino !"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configurer le compte"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Aucun compte actif"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Gérer les comptes"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Aucune discussion en cours"
 
@@ -337,7 +348,7 @@ msgstr "a arrêté d’écrire"
 msgid "Message too long"
 msgstr "Message trop long"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fichier"
 
@@ -345,32 +356,32 @@ msgstr "Fichier"
 msgid "This contact would like to add you to their contact list"
 msgstr "Ce contact voudrait vous ajouter à sa liste de contacts"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %Hh%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %Hh%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %Hh%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Configuration du salon"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Paramètres"
@@ -520,47 +529,55 @@ msgstr "Bloquer"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Tous les échanges de messages et de statuts sont bloqués"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Paramètres locaux"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Notifier vos correspondants lorsque vous écrivez"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Envoyer les accusés de réception"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notifications"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Paramètres locaux"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Activé"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Désactivé"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Seulement quand mentionné"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Par défaut : %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifier l’arrivée de nouveaux messages"
@@ -598,11 +615,6 @@ msgstr "Créer un compte"
 msgid "Could not establish a secure connection"
 msgstr "N'a pas pu établir une connexion sécurisée"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Retour"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Connexion"
diff --git a/main/po/gl.po b/main/po/gl.po
index b409ef40..d9f0be40 100644
--- a/main/po/gl.po
+++ b/main/po/gl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
-"PO-Revision-Date: 2019-01-05 11:06+0000\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
+"PO-Revision-Date: 2019-04-27 13:47+0000\n"
 "Language-Team: Galician <https://hosted.weblate.org/projects/dino/"
 "translations/gl/>\n"
 "Language: gl\n"
@@ -16,43 +16,43 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.4-dev\n"
+"X-Generator: Weblate 3.6.1\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Imaxe enviada"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Ficheiro enviado"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Imaxe recibida"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Ficheiro recibido"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Feito"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rexeitar"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Ocorreu un erro ó conectar cara %s"
@@ -76,7 +76,8 @@ msgstr "Escoller"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Rexistrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Comprobe %s para máis información sobre o rexistro"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Onte"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "hai %i min"
 msgstr[1] "hai %i minutos"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Xusto agora"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Unirse a un grupo"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Unirse"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Gardar"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Unirse a unha canle"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Seguinte"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Atrás"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
-msgstr "Comezar parola"
+msgstr "Comezar conversa"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Comezar"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Uníndose…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Precisa dun contrasinal para entrar na sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Non ten permiso para unirse ou crea-lo grupo"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "A sala non existe"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Non pode crea-la sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Sala só para membros"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Escolla un alcume diferente"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Demasiada xente na sala"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Benvida a Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configurar conta"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Sen contas activas"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Xestionar contas"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Sen parolas activas"
 
@@ -337,7 +348,7 @@ msgstr "deixou de escribir"
 msgid "Message too long"
 msgstr "Mensaxe demasiado longa"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Ficheiro"
 
@@ -345,32 +356,32 @@ msgstr "Ficheiro"
 msgid "This contact would like to add you to their contact list"
 msgstr "Esta persoa gostaríalle engadille á súa listaxe dos contactos"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -402,7 +413,7 @@ msgstr "Convidar ó grupo"
 
 #: main/src/ui/occupant_menu/view.vala:85
 msgid "Start private conversation"
-msgstr "Comezar parola privada"
+msgstr "Comezar conversa  privada"
 
 #: main/src/ui/occupant_menu/view.vala:93
 msgid "Kick"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Axustes da sala"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Axustes"
@@ -522,47 +531,55 @@ msgstr ""
 "As actualizacións do estado e comunicación están bloqueadas en calquera "
 "dirección"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Axustes locais"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Enviar notificacións ó escribir"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Enviar confirmacións de lectura"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notificacións"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Axustes locais"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Habilitado"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Inhabilitado"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Só cando che mencionan"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Por defecto: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar cando chega unha nova mensaxe"
@@ -600,11 +617,6 @@ msgstr "Crear unha conta"
 msgid "Could not establish a secure connection"
 msgstr "Non se estableceu unha conexión segura"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Atrás"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Conectar"
diff --git a/main/po/hu.po b/main/po/hu.po
index 58ec09dd..3aae5eb3 100644
--- a/main/po/hu.po
+++ b/main/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-02-26 08:17+0000\n"
 "Language-Team: Hungarian <https://hosted.weblate.org/projects/dino/"
 "translations/hu/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.5-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Kép érkezett"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Fájl érkezett"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Feliratkozási kérés"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Elfogadás"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Tiltás"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -76,7 +76,8 @@ msgstr "Választ"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Én"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Tegnap"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%I:%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i perccel ezelőtt"
 msgstr[1] "%i perccel ezelőtt"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Most"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Csatlakozás konferenciához"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Csatlakozás"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Mentés"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Csatlakozás csatornához"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Következő"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Csevegés kezdeményezése"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Indítás"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Csatlakozás…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "A szobába való belépéshez jelszó szükséges"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "A csatlakozás egy konferenciához, vagy új létrehozása le van tiltva"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "A szoba nem létezik"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Szoba létrehozása nem engedélyezett"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Csak tagoknak engedélyezett szoba"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Válassz egy másik becenevet"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Túl sok résztvevő van a szobában"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Nincs aktív fiók"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Fiókok kezelése"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Nincs aktív beszélgetés"
 
@@ -337,7 +348,7 @@ msgstr "abbahagyta a gépelést"
 msgid "Message too long"
 msgstr "Az üzenet túl hosszú"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fájl"
 
@@ -345,32 +356,32 @@ msgstr "Fájl"
 msgid "This contact would like to add you to their contact list"
 msgstr "Ez az ismerős hozzá szeretne adni téged az ismerőslistájához"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %I:%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %I:%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Szoba beállítása"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Beállítások"
@@ -521,47 +530,55 @@ msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "Mind a két irányból le van tiltva a kommunikáció és az állapotjelentések"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Helyi beállítások"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Gépelési értesítés küldése"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Kézbesítési jelentés küldése"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Értesítések"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Helyi beállítások"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Engedélyezve"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Csak ha említenek"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Alapértelmezett: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Értesítés új üzenet érkezésekor"
@@ -599,11 +616,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""
diff --git a/main/po/it.po b/main/po/it.po
index 9ceadd1e..55aa5927 100644
--- a/main/po/it.po
+++ b/main/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-05 11:06+0000\n"
 "Language-Team: Italian <https://hosted.weblate.org/projects/dino/"
 "translations/it/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Immagine inviata"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "File inviato"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Immagine ricevuta"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "File ricevuto"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Richiesta di iscrizione"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Accetta"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Rifiuta"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Connessione a %s fallita"
@@ -76,7 +76,8 @@ msgstr "Seleziona"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Registrati"
 msgid "Check %s for information on how to sign up"
 msgstr "Controlla %s per informazioni su come registrarsi"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Io"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i minuto fa"
 msgstr[1] "%i minuti fa"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Adesso"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Partecipa alla conferenza"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Partecipa"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Salva"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Entra nel Canale"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Avanti"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Indietro"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Inizia una Conversazione"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Inizia"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Accesso in corso…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Una password è richiesta per entrare nella stanza"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Ti è proibito entrare o creare la conferenza"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "La stanza non esiste"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Non sei abilitato a creare la stanza"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "La stanza è solo per membri"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Scegli un soprannome differente"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "La stanza ha troppi occupanti"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Benvenuto in Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configura account"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Nessun account attivo"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Gestisci accounts"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Nessuna conversazione attiva"
 
@@ -337,7 +348,7 @@ msgstr "ha smesso di scrivere"
 msgid "Message too long"
 msgstr "Messaggio troppo lungo"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "File"
 
@@ -345,32 +356,32 @@ msgstr "File"
 msgid "This contact would like to add you to their contact list"
 msgstr "Questo contatto vorrebbe aggiungerti alla sua lista contatti"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Impostazioni"
@@ -522,47 +531,55 @@ msgstr ""
 "La comunicazione e gli aggiornamenti di stato sono bloccati in entrambe le "
 "direzioni"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Impostazioni locali"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Invia notifiche di digitazione"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Invia ricevute di lettura"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notifiche"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Impostazioni locali"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Sì"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "No"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Solo se menzionato"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Default: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifica quando arriva un nuovo messaggio"
@@ -600,11 +617,6 @@ msgstr "Crea account"
 msgid "Could not establish a secure connection"
 msgstr "Impossibile stabilire una connessione sicura"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Indietro"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Connetti"
diff --git a/main/po/ja.po b/main/po/ja.po
index aa5f2d1c..764a0399 100644
--- a/main/po/ja.po
+++ b/main/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
-"PO-Revision-Date: 2018-04-04 05:38+0000\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
+"PO-Revision-Date: 2019-07-02 15:01+0000\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/dino/"
 "translations/ja/>\n"
 "Language: ja\n"
@@ -16,51 +16,51 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.20-dev\n"
+"X-Generator: Weblate 3.8-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
-msgstr ""
+msgstr "画像を送信しました"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
-msgstr ""
+msgstr "ファイルを送信しました"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
-msgstr ""
+msgstr "画像を受信しました"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
-msgstr ""
+msgstr "ファイルを受信しました"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "在席通知の申込"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "承諾"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "拒否"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
-msgstr ""
+msgstr "%s への接続に失敗しました"
 
 #: main/src/ui/manage_accounts/dialog.vala:126
 #, c-format
 msgid "Remove account %s?"
-msgstr "アカウント %s を削除しますか ?"
+msgstr "アカウント %s を削除しますか？"
 
 #: main/src/ui/manage_accounts/dialog.vala:129
 msgid "Remove"
@@ -76,7 +76,8 @@ msgstr "選択"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -92,15 +93,15 @@ msgstr "すべてのファイル"
 
 #: main/src/ui/manage_accounts/dialog.vala:221
 msgid "Connecting…"
-msgstr "接続中…"
+msgstr "接続試行中…"
 
 #: main/src/ui/manage_accounts/dialog.vala:223
 msgid "Connected"
-msgstr "接続しました"
+msgstr "接続済み"
 
 #: main/src/ui/manage_accounts/dialog.vala:225
 msgid "Disconnected"
-msgstr "切断しました"
+msgstr "切断"
 
 #: main/src/ui/manage_accounts/dialog.vala:234
 msgid "Wrong password"
@@ -122,34 +123,34 @@ msgstr "アカウントを追加"
 #: main/src/ui/manage_accounts/add_account_dialog.vala:156
 #, c-format
 msgid "Sign in to %s"
-msgstr ""
+msgstr "%s にサインイン"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:200
 #, c-format
 msgid "You can now start using %s"
-msgstr ""
+msgstr "%s をお使いいただけます"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:237
 #, c-format
 msgid "Could not connect to %s"
-msgstr ""
+msgstr "%s に接続できませんでした"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:254
 msgid "Wrong username or password"
-msgstr ""
+msgstr "ユーザー名またはパスワードが違います"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:287
 msgid "No response from server"
-msgstr ""
+msgstr "サーバーから応答がありません"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:293
 #, c-format
 msgid "Register on %s"
-msgstr ""
+msgstr "%s に登録"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:296
 msgid "The server requires to sign up through a website"
-msgstr ""
+msgstr "サーバーが Web サイトでのサインアップを要求しています"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:298
 msgid "Open Registration"
@@ -157,62 +158,63 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:314
 msgid "Register"
-msgstr ""
+msgstr "登録"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:316
 #, c-format
 msgid "Check %s for information on how to sign up"
-msgstr ""
+msgstr "サインアップの方法に関する情報は、%s をご確認ください"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
-msgstr ""
+msgstr "自分"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
-msgstr ""
+msgstr "%b%d日"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "昨日"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
-msgstr ""
+msgstr "%p %l∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分前"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "たった今"
 
 #: main/src/ui/application.vala:47
 msgid "Join Conference"
-msgstr "談話室に参加"
+msgstr "トークルームに参加"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "参加"
 
@@ -226,78 +228,87 @@ msgid "Save"
 msgstr "保存"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
-msgstr ""
+msgstr "チャンネルに参加"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
-msgstr "次"
+msgstr "次へ"
+
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "戻る"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
-msgstr ""
+msgstr "会話を開始"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "開始"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
-msgstr "参加します…"
+msgstr "参加試行中…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
-msgstr "談話室に入るにはパスワードが必要です"
+msgstr "トークルームに参加するにはパスワードが必要です"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
-msgstr "参加中または作成の談話室から締め出されました"
+msgstr "参加中または作成中のトークルームから退会させられました"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
-msgstr "談話室は存在しません"
+msgstr "トークルームは存在しません"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
-msgstr "談話室を作成する権限がありません"
+msgstr "トークルームを作成する権限がありません"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
-msgstr "メンバー制談話室"
+msgstr "メンバー制トークルーム"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "別のニックネームを選んでください"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
-msgstr "談話室は参加者が多すぎます"
+msgstr "トークルームの参加者が多すぎます"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
-msgstr ""
+msgstr "Dino へようこそ！"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
-msgstr ""
+msgstr "アカウントをセットアップ"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
-msgstr ""
+msgstr "アクティブなアカウントがありません"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "アカウントを管理"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
-msgstr ""
+msgstr "アクティブな会話がありません"
 
 #: main/src/ui/conversation_summary/date_separator_populator.vala:85
 msgid "Today"
@@ -305,77 +316,77 @@ msgstr "今日"
 
 #: main/src/ui/conversation_summary/date_separator_populator.vala:98
 msgid "%a, %b %d"
-msgstr ""
+msgstr "%b%d日 (%a)"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:146
 #, c-format
 msgid "%s, %s and %i others"
-msgstr ""
+msgstr "%s さん、%s さんとその他 %i 人"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:148
 #, c-format
 msgid "%s, %s and %s"
-msgstr ""
+msgstr "%s さん、%s さんと %s さん"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:150
 #, c-format
 msgid "%s and %s"
-msgstr ""
+msgstr "%s さんと %s さん"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:155
 msgid "is typing…"
 msgid_plural "are typing…"
-msgstr[0] "は入力中…"
+msgstr[0] "が入力しています…"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:157
 msgid "has stopped typing"
-msgstr "は入力を中断しました"
+msgstr "が入力を中断しました"
 
 #: main/src/ui/conversation_summary/content_item_widget_factory.vala:60
 msgid "Message too long"
 msgstr "メッセージが長すぎます"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "ファイル"
 
 #: main/src/ui/conversation_summary/subscription_notification.vala:48
 msgid "This contact would like to add you to their contact list"
-msgstr "この相手先はあなたを名簿に入れたいと希望しています"
+msgstr "この相手があなたを連絡先に入れようとしています"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
-msgstr ""
+msgstr "%x、%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
-msgstr ""
+msgstr "%x、%p %l∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
-msgstr ""
+msgstr "%b%d日、%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
-msgstr ""
+msgstr "%b%d日、%p %l∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
-msgstr ""
+msgstr "%a曜日、%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
-msgstr ""
+msgstr "%a曜日、%p %l∶%M"
 
 #: main/src/ui/occupant_menu/list.vala:106
 msgid "Owner"
-msgstr "主宰者"
+msgstr "オーナー"
 
 #: main/src/ui/occupant_menu/list.vala:108
 msgid "Admin"
@@ -396,20 +407,20 @@ msgstr "招待"
 
 #: main/src/ui/occupant_menu/view.vala:35
 msgid "Invite to Conference"
-msgstr "談話室へ招待"
+msgstr "トークルームへ招待"
 
 #: main/src/ui/occupant_menu/view.vala:85
 msgid "Start private conversation"
-msgstr "私信を始める"
+msgstr "個人チャットを始める"
 
 #: main/src/ui/occupant_menu/view.vala:93
 msgid "Kick"
-msgstr "蹴り出す"
+msgstr ""
 
 #: main/src/ui/global_search.vala:134
 #, c-format
 msgid "%i search results"
-msgstr ""
+msgstr "%i 件の検索結果"
 
 #: main/src/ui/global_search.vala:161
 #, c-format
@@ -423,44 +434,44 @@ msgstr ""
 
 #: main/src/ui/contact_details/dialog.vala:37
 msgid "Conference Details"
-msgstr "談話室の詳細"
+msgstr "トークルームの詳細"
 
 #: main/src/ui/contact_details/dialog.vala:37 main/data/menu_conversation.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:24
 msgid "Contact Details"
-msgstr "相手先の詳細"
+msgstr "連絡先の詳細"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:39
 msgid "Name of the room"
-msgstr "談話室の名称"
+msgstr "トークルームの名前"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:42
 msgid "Description of the room"
-msgstr "談話室の説明"
+msgstr "トークルームの説明"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:45
 msgid "Persistent"
-msgstr "常設"
+msgstr "トークルームを自動削除しない"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:46
 msgid "The room will persist after the last occupant leaves"
-msgstr "この談話室は最後の参加者が提出しても残ります"
+msgstr "最後の参加者が退会してもトークルームを残します"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:49
 msgid "Publicly searchable"
-msgstr "検索可"
+msgstr "外部から検索可能にする"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:52
 msgid "Occupants may change the subject"
-msgstr "参加者は題を変更できます"
+msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:55
 msgid "Discover real JIDs"
-msgstr "真の JID を探索"
+msgstr "JID の検索"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:56
 msgid "Who may discover real JIDs?"
-msgstr ""
+msgstr "JID の検索を許可する対象"
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:59
 #: main/data/manage_accounts/dialog.ui:170
@@ -500,68 +511,74 @@ msgstr ""
 
 #: main/src/ui/contact_details/muc_config_form_provider.vala:78
 msgid "Room Configuration"
-msgstr "談話室の調整"
+msgstr "トークルームの設定"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "設定"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Block"
-msgstr ""
+msgstr "ブロック"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
 msgid "Communication and status updates in either direction are blocked"
-msgstr ""
+msgstr "双方のコミュニケーションと状態の更新がブロックされます"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "ローカル設定"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
-msgstr ""
+msgstr "入力中であることを通知"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "通知"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr ""
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
-msgstr ""
+msgstr "オン"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
-msgstr ""
+msgstr "オフ"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
-msgstr ""
+msgstr "メンションされた場合のみ"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "デフォルト: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
-msgstr "新しいメッセージが届いたとき通知"
+msgstr "新しいメッセージが届いたときに通知"
 
 #: main/data/settings_dialog.ui:58
 msgid "Convert smileys to emojis"
@@ -573,11 +590,11 @@ msgstr "アカウント"
 
 #: main/data/manage_accounts/dialog.ui:200
 msgid "Local alias"
-msgstr ""
+msgstr "ローカルでの別名"
 
 #: main/data/manage_accounts/dialog.ui:255
 msgid "No accounts configured"
-msgstr ""
+msgstr "アカウントが設定されていません"
 
 #: main/data/manage_accounts/dialog.ui:266
 msgid "Add an account"
@@ -585,49 +602,44 @@ msgstr "アカウントを追加"
 
 #: main/data/manage_accounts/add_account_dialog.ui:31
 msgid "Sign in"
-msgstr ""
+msgstr "サインイン"
 
 #: main/data/manage_accounts/add_account_dialog.ui:78
 #: main/data/manage_accounts/add_account_dialog.ui:329
 msgid "Create account"
-msgstr ""
+msgstr "アカウントを作成"
 
 #: main/data/manage_accounts/add_account_dialog.ui:153
 msgid "Could not establish a secure connection"
-msgstr ""
-
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
+msgstr "安全な接続を確立できませんでした"
 
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
-msgstr ""
+msgstr "接続"
 
 #: main/data/manage_accounts/add_account_dialog.ui:341
 msgid "Choose a public server"
-msgstr ""
+msgstr "公開サーバーを選択"
 
 #: main/data/manage_accounts/add_account_dialog.ui:370
 msgid "Or specify a server address"
-msgstr ""
+msgstr "または、サーバーのアドレスを手入力"
 
 #: main/data/manage_accounts/add_account_dialog.ui:390
 msgid "Sign in instead"
-msgstr ""
+msgstr "代わりにサインイン"
 
 #: main/data/manage_accounts/add_account_dialog.ui:471
 msgid "Pick another server"
-msgstr ""
+msgstr "別のサーバーを選択"
 
 #: main/data/manage_accounts/add_account_dialog.ui:544
 msgid "All set up!"
-msgstr ""
+msgstr "すべてのセットアップが完了しました！"
 
 #: main/data/manage_accounts/add_account_dialog.ui:579
 msgid "Finish"
-msgstr ""
+msgstr "完了"
 
 #: main/data/menu_encryption.ui:14
 msgid "Unencrypted"
@@ -635,7 +647,7 @@ msgstr "非暗号化"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
 msgid "Modern XMPP Chat Client"
-msgstr ""
+msgstr "現代的な XMPP チャット クライアント"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
@@ -656,10 +668,11 @@ msgid ""
 "Dino fetches history from the server and synchronizes messages with other "
 "devices."
 msgstr ""
+"Dino はサーバーから履歴を取得し、ほかのデバイスとメッセージを同期します。"
 
 #: main/data/im.dino.Dino.appdata.xml.in:16
 msgid "Main window with conversations"
-msgstr ""
+msgstr "会話中のメインウィンドウ"
 
 #: main/data/add_conversation/conference_details_fragment.ui:19
 #: main/data/add_conversation/add_groupchat_dialog.ui:49
@@ -679,23 +692,23 @@ msgstr "別名"
 
 #: main/data/add_conversation/add_contact_dialog.ui:8
 msgid "Add Contact"
-msgstr "相手先を追加"
+msgstr "連絡先を追加"
 
 #: main/data/global_search.ui:37
 msgid "No active search"
-msgstr ""
+msgstr "まだ検索していません"
 
 #: main/data/global_search.ui:52
 msgid "Type to start a search"
-msgstr ""
+msgstr "入力して検索を開始してください"
 
 #: main/data/global_search.ui:85
 msgid "No matching messages"
-msgstr ""
+msgstr "一致するメッセージはありません"
 
 #: main/data/global_search.ui:100
 msgid "Check the spelling or try to remove filters"
-msgstr ""
+msgstr "スペルを確認するか、フィルターを消去してみてください"
 
 #~ msgid "JID should be of the form “user@example.com”"
 #~ msgstr "JID は “user@example.com” の形式にしてください"
diff --git a/main/po/lb.po b/main/po/lb.po
index ba396068..485e9fd1 100644
--- a/main/po/lb.po
+++ b/main/po/lb.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Luxembourgish (Dino)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-02-26 08:17+0000\n"
 "Language-Team: Luxembourgish <https://hosted.weblate.org/projects/dino/"
 "translations/lb/>\n"
@@ -14,40 +14,40 @@ msgstr ""
 "X-Generator: Weblate 3.5-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Bild geschéckt"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Datei geschéckt"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Bild kritt"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Datei kritt"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Abonnement Ufro"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akzeptéieren"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Verweigeren"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Feeler beim connectéieren op %s"
@@ -71,7 +71,8 @@ msgstr "Auswielen"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -159,46 +160,46 @@ msgstr "Registréieren"
 msgid "Check %s for information on how to sign up"
 msgstr "Kuck %s fir Informatioune iwwert Registréierung"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ech"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gëschter"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H:%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l:%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i Minutt hier"
 msgstr[1] "%i Minutten hier"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Just elo"
 
@@ -207,8 +208,9 @@ msgid "Join Conference"
 msgstr "Konferenz bäitrieden"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Bäitrieden"
 
@@ -222,76 +224,85 @@ msgid "Save"
 msgstr "Späicheren"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Kanal bäitrieden"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Nächst"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Zeréck"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Konversatioun starten"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Start"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Bäitrieden…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Passwuert gëtt gebraucht fir de Raum ze betrieden"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Gebannt vum bäitrieden an erstelle vu Konferenzen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Raum existéiert net"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Net erlaabt ee Raum ze erstellen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Raum ass nëmme fir Memberen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Wiel een anere Spëtznumm"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "De Raum huet ze vill Benotzer"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Wëllkomm bei Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Konto opsetzen"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Keng Kontoen aktiv"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Kontoe managen"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Keng Conversatiounen aktiv"
 
@@ -332,7 +343,7 @@ msgstr "huet opgehalen ze tippen"
 msgid "Message too long"
 msgstr "Noriicht ze laang"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Datei"
 
@@ -340,32 +351,32 @@ msgstr "Datei"
 msgid "This contact would like to add you to their contact list"
 msgstr "Dëse Kontakt wéilt dech gären an seng Kontaktlecht ophuelen"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l:%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l:%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -500,9 +511,7 @@ msgid "Room Configuration"
 msgstr "Raum Astellungen"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Astellungen"
@@ -515,47 +524,55 @@ msgstr "Blockéieren"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Kommunikatioun a Status Updates sinn an all Richtung blockéiert"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokal Astellungen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Tipp-Notifikatioune schécken"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Scheck Lies Bestätegungen"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notifikatiounen"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokal Astellungen"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Un"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Aus"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Nëmme wann erwäänt"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Standard: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Benoriichtege wann een neie Message ukënnt"
@@ -593,11 +610,6 @@ msgstr "Account kreéieren"
 msgid "Could not establish a secure connection"
 msgstr "Konnt keng geséchert Verbindung opbauen"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Zeréck"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Connectéieren"
diff --git a/main/po/nb.po b/main/po/nb.po
index 0bad72f9..b7b011bc 100644
--- a/main/po/nb.po
+++ b/main/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-07 18:06+0000\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/dino/"
 "translations/nb_NO/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Bilde sendt"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Fil sendt"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Bilde mottatt"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Fil mottatt"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Abonnementsforespørsel"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Godta"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Nekt"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Klarte ikke å koble til %s"
@@ -76,7 +76,8 @@ msgstr "Velg"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Registrer"
 msgid "Check %s for information on how to sign up"
 msgstr "Se %s for å lære hvordan du registrerer deg"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Meg"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "I går"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i minutt siden"
 msgstr[1] "%i minutter siden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Akkurat nå"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Ta del i konferanse"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Ta del"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Lagre"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Ta del i kanal"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Neste"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Tilbake"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Start samtale"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Start"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Tar del…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Passord kreves for å ta del i rommet"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Bannlyst fra å ta del i eller å opprette konferanser"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Rommet finnes ikke"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Ikke tillatt å opprette rom"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Rommet er kun for medlemmer"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Velg et annet kallenavn"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Rommet har for mange deltagere"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Velkommen til Dino."
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Sett opp konto"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Ingen kontoer aktive"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Behandle kontoer"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Ingen kontoer aktive"
 
@@ -337,7 +348,7 @@ msgstr "har tatt pause i skrivinga"
 msgid "Message too long"
 msgstr "Meldingen er for lang"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fil"
 
@@ -345,32 +356,32 @@ msgstr "Fil"
 msgid "This contact would like to add you to their contact list"
 msgstr "Denne kontakten ønsker å legge deg til på kontaktlisten sin"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -505,9 +516,7 @@ msgid "Room Configuration"
 msgstr "Rom-oppsett"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Innstillinger"
@@ -520,47 +529,55 @@ msgstr "Blokker"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Kommunikasjon og statusoppdateringer i begge retninger er blokkert"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale innstillinger"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Send skrivevarsling"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Send meldingskvitteringer"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Merknader"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale innstillinger"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "På"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Av"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Bare når nevnt"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Forvalg: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Varsle ved mottak av ny melding"
@@ -598,11 +615,6 @@ msgstr "Opprett konto"
 msgid "Could not establish a secure connection"
 msgstr "Kunne ikke etablere sikker forbindelse"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Tilbake"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Koble til"
diff --git a/main/po/nl.po b/main/po/nl.po
index 2ea8965e..6433f549 100644
--- a/main/po/nl.po
+++ b/main/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-12 20:06+0000\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/dino/translations/"
 "nl/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Afbeelding verzonden"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Bestand verzonden"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Afbeelding ontvangen"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Bestand ontvangen"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Verbinden met %s mislukt"
@@ -76,7 +76,8 @@ msgstr "Selecteren"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijk %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min geleden"
 msgstr[1] "%i min geleden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Zojuist"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Deelnemen aan groepsgesprek"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Deelnemen"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Opslaan"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Deelnemen aan kanaal"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Volgende"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Terug"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Gesprek beginnen"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Beginnen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Deelnemen…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Wachtwoord voor groepsgesprek vereist"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Deelnemen aan of aanmaken van groepsgesprekken verboden"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Groepsgesprek bestaat niet"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Aanmaken van groepsgesprek niet toegestaan"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Groepsgesprek is alleen-leden"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Kies een andere bijnaam"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Welkom bij Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Account instellen"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Geen accounts actief"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Accounts beheren"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Geen gesprekken actief"
 
@@ -337,7 +348,7 @@ msgstr "is gestopt met typen"
 msgid "Message too long"
 msgstr "Bericht te lang"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Bestand"
 
@@ -345,32 +356,32 @@ msgstr "Bestand"
 msgid "This contact would like to add you to their contact list"
 msgstr "Dit contact wil u toevoegen aan zijn/haar contacten"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %H:%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -506,9 +517,7 @@ msgid "Room Configuration"
 msgstr "Gespreksconfiguratie"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Instellingen"
@@ -521,47 +530,55 @@ msgstr "Blokkeren"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Aan-het-typen-meldingen sturen"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Leesbevestigingen sturen"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale instellingen"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Aan"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Uit"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Enkel wanneer vermeld"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Standaard: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Melding tonen bij nieuw bericht"
@@ -599,11 +616,6 @@ msgstr "Account aanmaken"
 msgid "Could not establish a secure connection"
 msgstr "Kon geen beveiligde verbinding opstellen"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Terug"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Verbinden"
diff --git a/main/po/nl_BE.po b/main/po/nl_BE.po
index cb7f464c..0251c701 100644
--- a/main/po/nl_BE.po
+++ b/main/po/nl_BE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-12 20:06+0000\n"
 "Language-Team: Flemish <https://hosted.weblate.org/projects/dino/"
 "translations/nl_BE/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Afbeelding verzonden"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Bestand verzonden"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Afbeelding ontvangen"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Bestand ontvangen"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Toestaan"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Afwijzen"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Verbinden met %s mislukt"
@@ -76,7 +76,8 @@ msgstr "Selecteren"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,46 +165,46 @@ msgstr "Registreren"
 msgid "Check %s for information on how to sign up"
 msgstr "Bekijkt %s voor meer informatie over hoe te registreren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ik"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%d %b"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Gisteren"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%Hu%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%lu%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min geleden"
 msgstr[1] "%i min geleden"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Zojuist"
 
@@ -212,8 +213,9 @@ msgid "Join Conference"
 msgstr "Deelnemen aan groepsgesprek"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Deelnemen"
 
@@ -227,76 +229,85 @@ msgid "Save"
 msgstr "Opslaan"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Deelnemen aan kanaal"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Volgende"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Terug"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Gesprek beginnen"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Beginnen"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Deelnemen…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Paswoord voor groepsgesprek vereist"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Deelnemen aan of aanmaken van groepsgesprekken verboden"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Groepsgesprek bestaat niet"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Aanmaken van groepsgesprek niet toegestaan"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Groepsgesprek is alleen-leden"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Kiest nen anderen bijnaam"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Groepsgesprek heeft te veel deelnemers"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Welkom bij Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Account instellen"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Geen accounts actief"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Accounts beheren"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Geen gesprekken actief"
 
@@ -337,7 +348,7 @@ msgstr "is gestopt met typen"
 msgid "Message too long"
 msgstr "Bericht te lang"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Bestand"
 
@@ -345,32 +356,32 @@ msgstr "Bestand"
 msgid "This contact would like to add you to their contact list"
 msgstr "Dit contact wilt u toevoegen aan zijn/haar contacten"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %Hu%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %lu%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%d %b, %Hu%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%d %b, %lu%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %Hu%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %lu%M %p"
@@ -508,9 +519,7 @@ msgid "Room Configuration"
 msgstr "Gespreksconfiguratie"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Instellingen"
@@ -523,47 +532,55 @@ msgstr "Blokkeren"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Communicatie en statusupdates worden in beide richtingen geblokkeerd"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Lokale instellingen"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Aan-het-typen-meldingen sturen"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Leesbevestigingen sturen"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Meldingen"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Lokale instellingen"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Aan"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Uit"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Enkel wanneer vermeld"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Standaard: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Melding tonen bij nieuw bericht"
@@ -601,11 +618,6 @@ msgstr "Account aanmaken"
 msgid "Could not establish a secure connection"
 msgstr "Kon geen beveiligde verbinding opstellen"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Terug"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Verbinden"
diff --git a/main/po/pl.po b/main/po/pl.po
index 5ac1d1ab..7cd11d83 100644
--- a/main/po/pl.po
+++ b/main/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-04-11 14:57+0200\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/dino/translations/"
 "pl/>\n"
@@ -20,40 +20,40 @@ msgstr ""
 "X-Generator: Poedit 2.2.1\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Wysłano obraz"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Wysłano plik"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Odebrano obraz"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Odebrano plik"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Żądanie subskrypcji"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Akceptuj"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Odmów"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Nie udało się połączyć z %s"
@@ -77,7 +77,8 @@ msgstr "Wybierz"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -165,38 +166,38 @@ msgstr "Zarejestruj"
 msgid "Check %s for information on how to sign up"
 msgstr "Sprawdź %s aby dowiedzieć się na temat rejestracji"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Ja"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Wczoraj"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
@@ -204,8 +205,8 @@ msgstr[0] "%i minuta temu"
 msgstr[1] "%i minuty temu"
 msgstr[2] "%i minut temu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Teraz"
 
@@ -214,8 +215,9 @@ msgid "Join Conference"
 msgstr "Dołącz do konferencji"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Dołącz"
 
@@ -229,76 +231,85 @@ msgid "Save"
 msgstr "Zapisz"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Dołącz do kanału"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Następny"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Wstecz"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Rozpocznij rozmowę"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Rozpocznij"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Dołączanie…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Pokój wymaga podania hasła"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Brak możliwości dołączenia lub utworzenia pokoju"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Pokój nie istnieje"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Brak uprawnień do utworzenia pokoju"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Pokój tylko dla członków"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Wybierz inny pseudonim"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Zbyt duża liczba osób w pokoju"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Witaj w Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Ustaw konto"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Brak aktywnych kont"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Zarządzaj kontami"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Brak aktywnych konwersacji"
 
@@ -340,7 +351,7 @@ msgstr "przerwał pisanie"
 msgid "Message too long"
 msgstr "Wiadomość jest zbyt długa"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Plik"
 
@@ -348,32 +359,32 @@ msgstr "Plik"
 msgid "This contact would like to add you to their contact list"
 msgstr "Ten kontakt chciałby dodać ciebie do swojej listy"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -508,9 +519,7 @@ msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Ustawienia"
@@ -524,47 +533,55 @@ msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 "Zablokowana możliwość wysyłania statusu oraz wiadomości w obu kierunkach"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Ustawienia lokalne"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Wyślij informację o pisaniu"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Wyślij informację o odczytaniu"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Ustawienia lokalne"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Włączone"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Wyłączone"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Tylko jeżeli wspomniano"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Domyślny: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Powiadom jeżeli nadejdzie wiadomość"
@@ -602,11 +619,6 @@ msgstr "Załóż konto"
 msgid "Could not establish a secure connection"
 msgstr "Nie można było nawiązać bezpiecznego połączenia"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Wstecz"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Połącz"
diff --git a/main/po/pt_BR.po b/main/po/pt_BR.po
index 98bbd778..0f2f7114 100644
--- a/main/po/pt_BR.po
+++ b/main/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-02-18 13:18+0000\n"
 "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/dino/"
 "translations/pt_BR/>\n"
@@ -18,40 +18,40 @@ msgstr ""
 "X-Generator: Weblate 3.5-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "imagem enviada"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "arquivo enviado"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "imagem recebida"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "arquivo recebido"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Pedido de assinatura"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Aceitar"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Negar"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Falha ao se conectar com %s"
@@ -75,7 +75,8 @@ msgstr "Selecionar"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -163,46 +164,46 @@ msgstr "Registrar"
 msgid "Check %s for information on how to sign up"
 msgstr "Verifique %s para informação de como se inscrever"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ontem"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i min atrás"
 msgstr[1] "%i min atrás"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Agora há pouco"
 
@@ -211,8 +212,9 @@ msgid "Join Conference"
 msgstr "Juntar-se a uma conferência"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Juntar-se"
 
@@ -226,76 +228,85 @@ msgid "Save"
 msgstr "Salvar"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Juntar-se a um canal"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Próximo"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Voltar"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Iniciar conversa"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Iniciar"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Juntando-se…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Senha necessária para entrar na sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Proibido de entrar ou criar uma conferência"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Sala não existe"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Não permitido criar sala"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Sala somente para membros"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Escolha um apelido diferente"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Número máximo da sala"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Seja bem vindo ao Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configurar a conta"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Nenhuma conta ativa"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Gerenciar contas"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Nenhuma conversa ativa"
 
@@ -336,7 +347,7 @@ msgstr "parou de digitar"
 msgid "Message too long"
 msgstr "Mensagem muito longa"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Arquivo"
 
@@ -344,32 +355,32 @@ msgstr "Arquivo"
 msgid "This contact would like to add you to their contact list"
 msgstr "Este contato gostaria de adicioná-lo à sua lista de contatos"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -504,9 +515,7 @@ msgid "Room Configuration"
 msgstr "Configuração da sala"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Configurações"
@@ -519,47 +528,55 @@ msgstr "Bloquear"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Comunicação e atualizações de status dos dois lados estão bloqueadas"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Configurações locais"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Enviar notificação ao digitar"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Enviar confirmação de leitura"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notificações"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Configurações locais"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Ligado"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Desligado"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Somente quando mencionado"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Padrão: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notificar quando uma nova mensagem chegar"
@@ -597,11 +614,6 @@ msgstr "Criar conta"
 msgid "Could not establish a secure connection"
 msgstr "Não foi possível estabelecer uma conexão segura"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Voltar"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Conectar"
diff --git a/main/po/ro.po b/main/po/ro.po
index 8e14123d..79f843b3 100644
--- a/main/po/ro.po
+++ b/main/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-01-05 11:06+0000\n"
 "Language-Team: Romanian <https://hosted.weblate.org/projects/dino/"
 "translations/ro/>\n"
@@ -20,40 +20,40 @@ msgstr ""
 "X-Generator: Weblate 3.4-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Imagine trimisă"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Fișier trimis"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Imagine primitä"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Fișier primit"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Cerere de abonare"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Acceptă"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Refuză"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Eroare la conectarea cu %s"
@@ -77,7 +77,8 @@ msgstr "Selectare"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -165,38 +166,38 @@ msgstr "Înregistrează-te"
 msgid "Check %s for information on how to sign up"
 msgstr "Aflați pe %s informații despre cum se face înregistrarea"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Eu"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Ieri"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
@@ -204,8 +205,8 @@ msgstr[0] "Acum %i minut"
 msgstr[1] "Acum %i minute"
 msgstr[2] "Acum %i de minute"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Chiar acum"
 
@@ -214,8 +215,9 @@ msgid "Join Conference"
 msgstr "Alătură-te unei conferințe"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Alătură-te"
 
@@ -229,76 +231,85 @@ msgid "Save"
 msgstr "Salvare"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Alătură-te canalului"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Următorul"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Înapoi"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Pornește o conversație"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Pornire"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Conectare…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Este necesară o parolă pentru a te putea alătura acestei discuții"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Aveți interdicție de a vă alătura sau de a crea o conferință"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Această discuție nu există"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Este interzisă crearea unei discuții"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Discuție accesibilă numai membrilor"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Alegeți un nume diferit"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Discuția are prea mulți membrii"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Bine ați venit la Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "Configurare cont"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Nici un cont activ"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Administrare conturi"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Nici o conversație activă"
 
@@ -340,7 +351,7 @@ msgstr "s-a oprit din scris"
 msgid "Message too long"
 msgstr "Mesaj prea lung"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Fișier"
 
@@ -348,32 +359,32 @@ msgstr "Fișier"
 msgid "This contact would like to add you to their contact list"
 msgstr "Acest contact dorește să vă adauge la lista ei/lui de contacte"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -508,9 +519,7 @@ msgid "Room Configuration"
 msgstr "Configurare discuție"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Setări"
@@ -523,47 +532,55 @@ msgstr "Blochează"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Comunicațiile și actualizările de stare sunt blocate în ambele sensuri"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Setări locale"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Trimite notificare la tastare"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Trimite notificare la primire"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Notificări"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Setări locale"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "Da"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "Nu"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Doar la mențiuni"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "Implicit: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Notifică atunci când este primit un mesaj nou"
@@ -601,11 +618,6 @@ msgstr "Creează cont"
 msgid "Could not establish a secure connection"
 msgstr "Nu s-a putut stabili o conexiune securizată"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Înapoi"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "Conectare"
diff --git a/main/po/ru.po b/main/po/ru.po
index 551ce81e..3160cd67 100644
--- a/main/po/ru.po
+++ b/main/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
-"PO-Revision-Date: 2019-02-04 12:09+0000\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
+"PO-Revision-Date: 2019-04-18 03:04+0000\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/dino/"
 "translations/ru/>\n"
 "Language: ru\n"
@@ -17,43 +17,43 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.5-dev\n"
+"X-Generator: Weblate 3.6-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "Изображение отправлено"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "Файл отправлен"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "Получено изображение"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "Получен файл"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "Требуется авторизация"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "Принять"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "Отклонить"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "Не удалось соединение с %s"
@@ -77,7 +77,8 @@ msgstr "Выбрать"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -123,7 +124,7 @@ msgstr "Добавить аккаунт"
 #: main/src/ui/manage_accounts/add_account_dialog.vala:156
 #, c-format
 msgid "Sign in to %s"
-msgstr ""
+msgstr "Вход в %s"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:200
 #, c-format
@@ -154,49 +155,49 @@ msgstr "Сервер требует авторизацию через сайт"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:298
 msgid "Open Registration"
-msgstr ""
+msgstr "Открытая регистрация"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:314
 msgid "Register"
-msgstr ""
+msgstr "Зарегистрироваться"
 
 #: main/src/ui/manage_accounts/add_account_dialog.vala:316
 #, c-format
 msgid "Check %s for information on how to sign up"
-msgstr ""
+msgstr "Посмотрите %s, чтобы узнать, как зарегистрироваться"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "Я"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%b %d"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "Вчера"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
@@ -204,8 +205,8 @@ msgstr[0] "%i минуту назад"
 msgstr[1] "%i минуты назад"
 msgstr[2] "%i минут назад"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "Только что"
 
@@ -214,8 +215,9 @@ msgid "Join Conference"
 msgstr "Войти в конференцию"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "Войти"
 
@@ -229,76 +231,85 @@ msgid "Save"
 msgstr "Сохранить"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "Войти в канал"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "Следующее"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "Назад"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "Начать чат"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "Начать"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "Присоединение…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "Требуется пароль для входа в комнату"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "Вам запрещено заходить в конференции или создавать их"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "Данная комната не существует"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "Вам запрещенно создавать комнаты"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "Комната только для участников"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "Выберите другой никнейм"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "Слишком много посетителей в комнате"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "Добро пожаловать в Dino!"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
-msgstr ""
+msgstr "Настроить учётную запись"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "Нет активных аккаунтов"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "Управление аккаунтами"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "Нет активных чатов"
 
@@ -311,9 +322,9 @@ msgid "%a, %b %d"
 msgstr "%a, %b %d"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:146
-#, fuzzy, c-format
+#, c-format
 msgid "%s, %s and %i others"
-msgstr "%s, %s и %i других"
+msgstr "%s, %s и ещё %i человек"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:148
 #, c-format
@@ -326,12 +337,11 @@ msgid "%s and %s"
 msgstr "%s и %s"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:155
-#, fuzzy
 msgid "is typing…"
 msgid_plural "are typing…"
 msgstr[0] "печатает…"
-msgstr[1] "печатает…"
-msgstr[2] "печатает…"
+msgstr[1] "печатают…"
+msgstr[2] "печатают…"
 
 #: main/src/ui/conversation_summary/chat_state_populator.vala:157
 msgid "has stopped typing"
@@ -341,7 +351,7 @@ msgstr "перестал печатать"
 msgid "Message too long"
 msgstr "Сообщение слишком длинное"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "Файл"
 
@@ -349,32 +359,32 @@ msgstr "Файл"
 msgid "This contact would like to add you to their contact list"
 msgstr "Этот контакт хочет добавить вас в список контактов"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%b %d, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%b %d, %l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%a, %H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%a, %l∶%M %p"
@@ -415,7 +425,7 @@ msgstr "Выгнать"
 #: main/src/ui/global_search.vala:134
 #, c-format
 msgid "%i search results"
-msgstr ""
+msgstr "Результаты поиска по запросу «%i»"
 
 #: main/src/ui/global_search.vala:161
 #, c-format
@@ -509,9 +519,7 @@ msgid "Room Configuration"
 msgstr "Конфигурация комнаты"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "Настройки"
@@ -524,47 +532,55 @@ msgstr "Заблокировать"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "Переписка и обновления статусов заблокированы в оба направления"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "Локальные настройки"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "Отправлять уведомления о наборе сообщения"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "Отправлять уведомления о прочтении"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "Локальные настройки"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "ВКЛ"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "ВЫКЛ"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "Только при упоминании"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "По умолчанию: %s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "Уведомлять о новых сообщениях"
@@ -602,30 +618,25 @@ msgstr "Создать аккаунт"
 msgid "Could not establish a secure connection"
 msgstr "Не удалось установить защищённое соединение"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "Назад"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
-msgstr ""
+msgstr "Присоединиться"
 
 #: main/data/manage_accounts/add_account_dialog.ui:341
 msgid "Choose a public server"
-msgstr ""
+msgstr "Выберите публичный сервер"
 
 #: main/data/manage_accounts/add_account_dialog.ui:370
 msgid "Or specify a server address"
-msgstr ""
+msgstr "Или введите адрес сервера сами"
 
 #: main/data/manage_accounts/add_account_dialog.ui:390
 msgid "Sign in instead"
-msgstr ""
+msgstr "Войти"
 
 #: main/data/manage_accounts/add_account_dialog.ui:471
 msgid "Pick another server"
-msgstr ""
+msgstr "Выбрать другой сервер"
 
 #: main/data/manage_accounts/add_account_dialog.ui:544
 msgid "All set up!"
@@ -640,9 +651,8 @@ msgid "Unencrypted"
 msgstr "Не шифровать"
 
 #: main/data/im.dino.Dino.appdata.xml.in:8
-#, fuzzy
 msgid "Modern XMPP Chat Client"
-msgstr "Современный XMPP-клиент"
+msgstr "Современный чат-клиент на XMPP"
 
 #: main/data/im.dino.Dino.appdata.xml.in:10
 msgid ""
diff --git a/main/po/zh_Hans.po b/main/po/zh_Hans.po
index ef2f1ecf..84dbaee3 100644
--- a/main/po/zh_Hans.po
+++ b/main/po/zh_Hans.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dino\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: 2019-02-02 14:09+0000\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "dino/translations/zh_Hans/>\n"
@@ -19,40 +19,40 @@ msgstr ""
 "X-Generator: Weblate 3.5-dev\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr "图片已发送"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr "文件已发送"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr "图片已接收"
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr "文件已接收"
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr "订阅请求"
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr "接受"
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr "拒绝"
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr "连接 %s 失败"
@@ -76,7 +76,8 @@ msgstr "选择"
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -164,45 +165,45 @@ msgstr "注册"
 msgid "Check %s for information on how to sign up"
 msgstr "检查 %s 以获取如何注册的信息"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr "我"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr "%_m 月 %_d 日"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr "昨天"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr "%H∶%M"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr "%l∶%M %p"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] "%i 分钟以前"
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr "刚刚"
 
@@ -211,8 +212,9 @@ msgid "Join Conference"
 msgstr "加入群聊"
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr "加入"
 
@@ -226,76 +228,85 @@ msgid "Save"
 msgstr "保存"
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr "加入频道"
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr "下一个"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr "返回"
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr "开始聊天"
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr "开始"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr "加入中…"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr "要加入房间需要输入密码"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr "被禁止加入或创建聊天室"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr "房间不存在"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr "不允许创建房间"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr "仅限会员的房间"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr "选择一个不同的昵称"
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr "房间内人数过多"
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr "欢迎来到 Dino！"
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr "设置帐户"
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr "没有激活的帐号"
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr "管理帐号"
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr "没有激活的会话"
 
@@ -335,7 +346,7 @@ msgstr "已经停止输入"
 msgid "Message too long"
 msgstr "消息太长"
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr "文件"
 
@@ -343,32 +354,32 @@ msgstr "文件"
 msgid "This contact would like to add you to their contact list"
 msgstr "该联系人想把你加到他们的联系人列表"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr "%x，%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr "%x，%l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr "%_m 月 %_d 日，%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr "%_m 月 %_d 日，%l∶%M %p"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr "%A，%H∶%M"
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr "%A，%l∶%M %p"
@@ -503,9 +514,7 @@ msgid "Room Configuration"
 msgstr "房间配置"
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr "设置"
@@ -518,47 +527,55 @@ msgstr "封禁"
 msgid "Communication and status updates in either direction are blocked"
 msgstr "双向通讯和状态更新已经被封禁"
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr "本地设置"
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr "发送打字通知"
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr "发送已读回执"
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr "通知"
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr "本地设置"
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr "开启"
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr "关闭"
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr "只有被提到时"
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr "默认：%s"
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr "新消息到达时通知"
@@ -596,11 +613,6 @@ msgstr "创建账户"
 msgid "Could not establish a secure connection"
 msgstr "无法建立安全连接"
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr "返回"
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr "连接"
diff --git a/main/po/zh_Hant.po b/main/po/zh_Hant.po
index 8abc73b2..5f82c04d 100644
--- a/main/po/zh_Hant.po
+++ b/main/po/zh_Hant.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-16 14:38+0100\n"
+"POT-Creation-Date: 2019-07-04 16:27+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: none\n"
 "Language: zh_Hant\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "Image sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:67
-#: main/src/ui/conversation_selector/conversation_row.vala:155
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:155
 msgid "File sent"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "Image received"
 msgstr ""
 
 #: main/src/ui/notifications.vala:69
-#: main/src/ui/conversation_selector/conversation_row.vala:157
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:157
 msgid "File received"
 msgstr ""
 
-#: main/src/ui/notifications.vala:88
+#: main/src/ui/notifications.vala:94
 msgid "Subscription request"
 msgstr ""
 
-#: main/src/ui/notifications.vala:94
+#: main/src/ui/notifications.vala:101
 #: main/src/ui/conversation_summary/subscription_notification.vala:37
 msgid "Accept"
 msgstr ""
 
-#: main/src/ui/notifications.vala:95
+#: main/src/ui/notifications.vala:102
 #: main/src/ui/conversation_summary/subscription_notification.vala:38
 msgid "Deny"
 msgstr ""
 
-#: main/src/ui/notifications.vala:101
+#: main/src/ui/notifications.vala:108
 #, c-format
 msgid "Failed connecting to %s"
 msgstr ""
@@ -74,7 +74,8 @@ msgstr ""
 
 #: main/src/ui/manage_accounts/dialog.vala:153 main/src/ui/application.vala:47
 #: main/src/ui/add_conversation/add_conference_dialog.vala:16
-#: main/src/ui/add_conversation/select_contact_dialog.vala:41
+#: main/src/ui/add_conversation/add_conference_dialog.vala:125
+#: main/src/ui/add_conversation/select_contact_dialog.vala:38
 #: main/data/add_conversation/add_groupchat_dialog.ui:11
 #: main/data/add_conversation/add_contact_dialog.ui:12
 msgid "Cancel"
@@ -162,45 +163,45 @@ msgstr ""
 msgid "Check %s for information on how to sign up"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:136
-#: main/src/ui/conversation_selector/conversation_row.vala:147
-#: main/src/ui/conversation_selector/conversation_row.vala:150
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:136
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:147
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:150
 #: main/src/ui/util/helper.vala:87
 msgid "Me"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:259
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:259
 #: main/src/ui/conversation_summary/date_separator_populator.vala:100
 #, no-c-format
 msgid "%b %d"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:263
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:263
 #: main/src/ui/conversation_summary/date_separator_populator.vala:91
 msgid "Yesterday"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:266
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:196
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:266
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:229
 #, no-c-format
 msgid "%H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:267
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:197
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:267
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:230
 #, no-c-format
 msgid "%l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:270
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:201
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:270
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:234
 #, c-format
 msgid "%i min ago"
 msgid_plural "%i mins ago"
 msgstr[0] ""
 
-#: main/src/ui/conversation_selector/conversation_row.vala:272
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:203
+#: main/src/ui/conversation_selector/conversation_selector_row.vala:272
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:236
 msgid "Just now"
 msgstr ""
 
@@ -209,8 +210,9 @@ msgid "Join Conference"
 msgstr ""
 
 #: main/src/ui/application.vala:47
-#: main/src/ui/add_conversation/add_conference_dialog.vala:63
-#: main/src/ui/add_conversation/conference_details_fragment.vala:133
+#: main/src/ui/add_conversation/add_conference_dialog.vala:69
+#: main/src/ui/add_conversation/add_conference_dialog.vala:144
+#: main/src/ui/add_conversation/conference_details_fragment.vala:141
 msgid "Join"
 msgstr ""
 
@@ -224,76 +226,85 @@ msgid "Save"
 msgstr ""
 
 #: main/src/ui/add_conversation/add_conference_dialog.vala:27
-#: main/src/ui/unified_window.vala:196 main/data/menu_add.ui:13
+#: main/src/ui/unified_window.vala:190 main/data/menu_add.ui:13
 msgid "Join Channel"
 msgstr ""
 
-#: main/src/ui/add_conversation/add_conference_dialog.vala:48
+#: main/src/ui/add_conversation/add_conference_dialog.vala:50
+#: main/src/ui/add_conversation/add_conference_dialog.vala:121
 #: main/data/manage_accounts/add_account_dialog.ui:99
 #: main/data/manage_accounts/add_account_dialog.ui:411
 #: main/data/manage_accounts/add_account_dialog.ui:491
 msgid "Next"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:85
-#: main/src/ui/unified_window.vala:195 main/data/menu_add.ui:7
+#: main/src/ui/add_conversation/add_conference_dialog.vala:150
+#: main/data/manage_accounts/add_account_dialog.ui:175
+#: main/data/manage_accounts/add_account_dialog.ui:268
+msgid "Back"
+msgstr ""
+
+#: main/src/ui/add_conversation/select_contact_dialog.vala:97
+#: main/src/ui/unified_window.vala:189
+#: main/data/conversation_list_titlebar_csd.ui:12
+#: main/data/conversation_list_titlebar.ui:16 main/data/menu_add.ui:7
 #: main/data/im.dino.Dino.appdata.xml.in:20
 msgid "Start Conversation"
 msgstr ""
 
-#: main/src/ui/add_conversation/select_contact_dialog.vala:86
+#: main/src/ui/add_conversation/select_contact_dialog.vala:98
 msgid "Start"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:108
+#: main/src/ui/add_conversation/conference_details_fragment.vala:89
 msgid "Joining…"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:138
+#: main/src/ui/add_conversation/conference_details_fragment.vala:146
 msgid "Password required to enter room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:143
+#: main/src/ui/add_conversation/conference_details_fragment.vala:151
 msgid "Banned from joining or creating conference"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:145
+#: main/src/ui/add_conversation/conference_details_fragment.vala:153
 msgid "Room does not exist"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:147
+#: main/src/ui/add_conversation/conference_details_fragment.vala:155
 msgid "Not allowed to create room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:149
+#: main/src/ui/add_conversation/conference_details_fragment.vala:157
 msgid "Members-only room"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:152
+#: main/src/ui/add_conversation/conference_details_fragment.vala:160
 msgid "Choose a different nick"
 msgstr ""
 
-#: main/src/ui/add_conversation/conference_details_fragment.vala:154
+#: main/src/ui/add_conversation/conference_details_fragment.vala:162
 msgid "Too many occupants in room"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:174
+#: main/src/ui/unified_window.vala:168
 msgid "Welcome to Dino!"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:176
+#: main/src/ui/unified_window.vala:170
 msgid "Set up account"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:184
+#: main/src/ui/unified_window.vala:178
 msgid "No active accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:185
+#: main/src/ui/unified_window.vala:179
 msgid "Manage accounts"
 msgstr ""
 
-#: main/src/ui/unified_window.vala:194
+#: main/src/ui/unified_window.vala:188
 msgid "No active conversations"
 msgstr ""
 
@@ -333,7 +344,7 @@ msgstr ""
 msgid "Message too long"
 msgstr ""
 
-#: main/src/ui/conversation_summary/content_item_widget_factory.vala:212
+#: main/src/ui/conversation_summary/content_item_widget_factory.vala:213
 msgid "File"
 msgstr ""
 
@@ -341,32 +352,32 @@ msgstr ""
 msgid "This contact would like to add you to their contact list"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:184
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:217
 #, no-c-format
 msgid "%x, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:185
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:218
 #, no-c-format
 msgid "%x, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:188
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:221
 #, no-c-format
 msgid "%b %d, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:189
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:222
 #, no-c-format
 msgid "%b %d, %l∶%M %p"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:192
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:225
 #, no-c-format
 msgid "%a, %H∶%M"
 msgstr ""
 
-#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:193
+#: main/src/ui/conversation_summary/conversation_item_skeleton.vala:226
 #, no-c-format
 msgid "%a, %l∶%M %p"
 msgstr ""
@@ -501,9 +512,7 @@ msgid "Room Configuration"
 msgstr ""
 
 #: main/src/ui/contact_details/blocking_provider.vala:31
-#: main/src/ui/contact_details/settings_provider.vala:22
-#: main/src/ui/contact_details/settings_provider.vala:25
-#: main/src/ui/contact_details/settings_provider.vala:30
+#: main/src/ui/contact_details/settings_provider.vala:12
 #: main/data/settings_dialog.ui:7 main/data/menu_app.ui:11
 msgid "Settings"
 msgstr ""
@@ -516,47 +525,55 @@ msgstr ""
 msgid "Communication and status updates in either direction are blocked"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:22
+#: main/src/ui/contact_details/settings_provider.vala:13
+msgid "Local Settings"
+msgstr ""
+
+#: main/src/ui/contact_details/settings_provider.vala:28
 #: main/data/settings_dialog.ui:22
 msgid "Send typing notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:25
+#: main/src/ui/contact_details/settings_provider.vala:33
 #: main/data/settings_dialog.ui:34
 msgid "Send read receipts"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:30
-#: main/src/ui/contact_details/settings_provider.vala:39
+#: main/src/ui/contact_details/settings_provider.vala:38
+#: main/src/ui/contact_details/settings_provider.vala:47
 msgid "Notifications"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:39
-msgid "Local Settings"
-msgstr ""
-
-#: main/src/ui/contact_details/settings_provider.vala:74
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:116
+#: main/src/ui/contact_details/settings_provider.vala:82
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:124
 msgid "On"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:76
-#: main/src/ui/contact_details/settings_provider.vala:114
-#: main/src/ui/contact_details/settings_provider.vala:117
+#: main/src/ui/contact_details/settings_provider.vala:84
+#: main/src/ui/contact_details/settings_provider.vala:122
+#: main/src/ui/contact_details/settings_provider.vala:125
 msgid "Off"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:78
+#: main/src/ui/contact_details/settings_provider.vala:86
 msgid "Only when mentioned"
 msgstr ""
 
-#: main/src/ui/contact_details/settings_provider.vala:80
-#: main/src/ui/contact_details/settings_provider.vala:115
+#: main/src/ui/contact_details/settings_provider.vala:88
+#: main/src/ui/contact_details/settings_provider.vala:123
 #, c-format
 msgid "Default: %s"
 msgstr ""
 
+#: main/src/ui/conversation_titlebar/search_entry.vala:11
+msgid "Search messages"
+msgstr ""
+
+#: main/src/ui/conversation_titlebar/occupants_entry.vala:37
+msgid "Members"
+msgstr ""
+
 #: main/data/settings_dialog.ui:46
 msgid "Notify when a new message arrives"
 msgstr ""
@@ -594,11 +611,6 @@ msgstr ""
 msgid "Could not establish a secure connection"
 msgstr ""
 
-#: main/data/manage_accounts/add_account_dialog.ui:175
-#: main/data/manage_accounts/add_account_dialog.ui:268
-msgid "Back"
-msgstr ""
-
 #: main/data/manage_accounts/add_account_dialog.ui:289
 msgid "Connect"
 msgstr ""