diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index ab82108fa..ac4a7257a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">إمسح رسالة الحالة فيما بعدٌ</string>
     <string name="close">إغلاق</string>
     <string name="continuous_voice_message_recording">قَفْل التسجيل للتسجيل المستمر للرسالة الصوتية</string>
+    <string name="conversation_is_read_only">المحادثة للقراءة فقط</string>
     <string name="conversations">محادثات</string>
     <string name="create_conversation">انشاء محادثة</string>
     <string name="create_issue">تكوين إشكالية </string>
@@ -32,6 +33,8 @@
     <string name="dnd">الرجاء عدم الإزعاج</string>
     <string name="dontClear">لا تمحُ</string>
     <string name="edit">تعديل</string>
+    <string name="edit_error_24_hours_old_message">لا يمكن تحرير رسائل أقدم من 24 ساعة</string>
+    <string name="edit_message_icon_description">تحرير أيقونة الرسالة</string>
     <string name="emoji_backspace">سهم خلفي backspace</string>
     <string name="emoji_category_recent">مؤخّراً recednt</string>
     <string name="encrypted">مُشفّر</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">تغيير شهادة المصادقة</string>
     <string name="nc_circle">الدائرة Circle</string>
     <string name="nc_circles">الدوائر Circles</string>
+    <string name="nc_clear_edit_button">محو زر التحرير</string>
+    <string name="nc_clear_edit_message">محو تحرير الرسالة</string>
     <string name="nc_clear_history">مسح جميع الرسائل</string>
     <string name="nc_clear_history_success">تمّ مسح جميع الرسائل</string>
     <string name="nc_clear_history_warning">هل تريد مسح جميع الرسائل في هذه المحادثة؟</string>
@@ -138,6 +143,7 @@
     <string name="nc_conversation_menu_conversation_info">بيانات المحادثة</string>
     <string name="nc_conversation_menu_video_call">اتصال فيديو</string>
     <string name="nc_conversation_menu_voice_call">اتصال فيديو</string>
+    <string name="nc_conversation_not_found">المحادثة غير موجودة</string>
     <string name="nc_conversation_settings">إعدادات المحادثة</string>
     <string name="nc_conversations_empty">إنضم لمحادثةٍ او ابدأ محادثةً جديدةً</string>
     <string name="nc_conversations_empty_details">رحّب بالأصدقاء و الزملاء!</string>
@@ -208,7 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">نعم</string>
     <string name="nc_display_name_not_fetched">لايمكن عرض الاسم، جارِ إلالغاء</string>
     <string name="nc_display_name_not_stored">تعذر تخزين اسم العرض ، جارِ إلالغاء</string>
+    <string name="nc_edit_icon">أيقونة التحرير</string>
     <string name="nc_edit_message">تحرير</string>
+    <string name="nc_edit_message_text">نص تحرير الرسالة</string>
+    <string name="nc_edited_by">تمّ التحرير من قِبَل</string>
+    <string name="nc_edited_by_admin">تمّ التحرير من قِبَل المُشرف</string>
     <string name="nc_email">البريد الإلكتروني</string>
     <string name="nc_expire_message_eight_hours">8 ساعات</string>
     <string name="nc_expire_message_four_weeks">4 أسابيع</string>
@@ -356,6 +366,7 @@
     <string name="nc_search">البحث</string>
     <string name="nc_select_an_account">اختيار حساب</string>
     <string name="nc_select_participants">إختَر مُشارِكين</string>
+    <string name="nc_send_edit_message">إرسال تحرير الرسالة</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s ارسل GIF.</string>
     <string name="nc_sent_a_gif_you">لقد قمت بارسال GIF.</string>
     <string name="nc_sent_a_video" formatted="true">%1$sارسل فيديو.</string>
diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml
index e65d4e50b..30c705e8a 100644
--- a/app/src/main/res/values-b+en+001/strings.xml
+++ b/app/src/main/res/values-b+en+001/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">Clear status message after</string>
     <string name="close">Close</string>
     <string name="continuous_voice_message_recording">Lock recording for continuously recording of the voice message</string>
+    <string name="conversation_is_read_only">Conversation is read Only</string>
     <string name="conversations">Conversations</string>
     <string name="create_conversation">Create conversation</string>
     <string name="create_issue">Create issue</string>
@@ -32,6 +33,8 @@
     <string name="dnd">Do not disturb</string>
     <string name="dontClear">Don\'t clear</string>
     <string name="edit">Edit</string>
+    <string name="edit_error_24_hours_old_message">Cannot Edit Messages older than 24 hours</string>
+    <string name="edit_message_icon_description">Edit Message Icon</string>
     <string name="emoji_backspace">Backspace</string>
     <string name="emoji_category_recent">Recent</string>
     <string name="encrypted">Encrypted</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">Change authentication certificate</string>
     <string name="nc_circle">Circle</string>
     <string name="nc_circles">Circles</string>
+    <string name="nc_clear_edit_button">clear Edit Button</string>
+    <string name="nc_clear_edit_message">Clear Edit Message</string>
     <string name="nc_clear_history">Delete all messages</string>
     <string name="nc_clear_history_success">All messages were deleted</string>
     <string name="nc_clear_history_warning">Do you really want to delete all messages in this conversation?</string>
@@ -138,6 +143,7 @@
     <string name="nc_conversation_menu_conversation_info">Conversation info</string>
     <string name="nc_conversation_menu_video_call">Video call</string>
     <string name="nc_conversation_menu_voice_call">Voice call</string>
+    <string name="nc_conversation_not_found">Conversation not found</string>
     <string name="nc_conversation_settings">Conversation settings</string>
     <string name="nc_conversations_empty">Join a conversation or start a new one</string>
     <string name="nc_conversations_empty_details">Say hi to your friends and colleagues!</string>
@@ -208,6 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">Yes</string>
     <string name="nc_display_name_not_fetched">Display name couldn\'t be fetched, aborting</string>
     <string name="nc_display_name_not_stored">Could not store display name, aborting</string>
+    <string name="nc_edit_icon">Edit Icon</string>
+    <string name="nc_edit_message">Edit</string>
+    <string name="nc_edit_message_text">Edit Message Text</string>
+    <string name="nc_edited_by">"Edited by "</string>
+    <string name="nc_edited_by_admin">Edited by admin</string>
     <string name="nc_email">Email</string>
     <string name="nc_expire_message_eight_hours">8 hours</string>
     <string name="nc_expire_message_four_weeks">4 weeks</string>
@@ -355,6 +366,7 @@
     <string name="nc_search">Search</string>
     <string name="nc_select_an_account">Select an account</string>
     <string name="nc_select_participants">Select participants</string>
+    <string name="nc_send_edit_message">Send Edit Message</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s sent a GIF.</string>
     <string name="nc_sent_a_gif_you">You sent a GIF.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s sent a video.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7910f0759..4b01bd9e5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">Statusmeldung löschen nach</string>
     <string name="close">Schließen</string>
     <string name="continuous_voice_message_recording">Aufnahme sperren für kontinuierliche Aufzeichnung der Sprachnachricht</string>
+    <string name="conversation_is_read_only">Unterhaltung ist schreibgeschützt</string>
     <string name="conversations">Unterhaltungen</string>
     <string name="create_conversation">Unterhaltung erstellen</string>
     <string name="create_issue">Fehler melden</string>
@@ -32,6 +33,8 @@
     <string name="dnd">Nicht stören</string>
     <string name="dontClear">Nicht löschen</string>
     <string name="edit">Bearbeiten</string>
+    <string name="edit_error_24_hours_old_message">Nachrichten, die älter als 24 Stunden sind, können nicht bearbeitet werden</string>
+    <string name="edit_message_icon_description">Nachrichten-Symbol bearbeiten</string>
     <string name="emoji_backspace">Rücktaste</string>
     <string name="emoji_category_recent">Neueste</string>
     <string name="encrypted">Verschlüsselt</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">Authentifizierungs-Zertifikat ändern</string>
     <string name="nc_circle">Kreis</string>
     <string name="nc_circles">Kreise</string>
+    <string name="nc_clear_edit_button">Schaltfläche „Bearbeiten“ löschen</string>
+    <string name="nc_clear_edit_message">Bearbeitungsnachricht löschen</string>
     <string name="nc_clear_history">Alle Nachrichten löschen</string>
     <string name="nc_clear_history_success">Alle Nachrichten wurden gelöscht</string>
     <string name="nc_clear_history_warning">Möchten Sie wirklich alle Nachrichten dieser Unterhaltung löschen?</string>
@@ -138,6 +143,7 @@
     <string name="nc_conversation_menu_conversation_info">Unterhaltungs-Information</string>
     <string name="nc_conversation_menu_video_call">Videoanruf</string>
     <string name="nc_conversation_menu_voice_call">Sprachanruf</string>
+    <string name="nc_conversation_not_found">Unterhaltung nicht gefunden</string>
     <string name="nc_conversation_settings">Unterhaltungseinstellungen</string>
     <string name="nc_conversations_empty">Treten Sie einer Unterhaltung bei oder starten Sie eine neue</string>
     <string name="nc_conversations_empty_details">Begrüßen Sie Ihre Freunde und Kollegen!</string>
@@ -208,6 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">Ja</string>
     <string name="nc_display_name_not_fetched">Anzeigename konnte nicht abgerufen werden. Breche ab.</string>
     <string name="nc_display_name_not_stored">Der Anzeigename konnte nicht gespeichert werden. Breche ab.</string>
+    <string name="nc_edit_icon">Symbol bearbeiten</string>
+    <string name="nc_edit_message">Bearbeiten</string>
+    <string name="nc_edit_message_text">Nachrichtentext bearbeiten</string>
+    <string name="nc_edited_by">Bearbeitet von</string>
+    <string name="nc_edited_by_admin">Bearbeitet von der Administration</string>
     <string name="nc_email">E-Mail</string>
     <string name="nc_expire_message_eight_hours">8 Stunden</string>
     <string name="nc_expire_message_four_weeks">4 Wochen</string>
@@ -355,6 +366,7 @@
     <string name="nc_search">Suchen</string>
     <string name="nc_select_an_account">Konto auswählen</string>
     <string name="nc_select_participants">Teilnehmer auswählen</string>
+    <string name="nc_send_edit_message">Bearbeitungsnachricht senden</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s hat ein GIF gesendet.</string>
     <string name="nc_sent_a_gif_you">Sie haben ein GIF gesendet.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s hat ein Video gesendet.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 44d774a9b..4d9eb4365 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">Fjern statusmelding etter</string>
     <string name="close">Lukk</string>
     <string name="continuous_voice_message_recording">Lås opptak for kontinuerlig opptak av talemeldingen</string>
+    <string name="conversation_is_read_only">Denne samtalen er skrivebeskyttet</string>
     <string name="conversations">Samtaler</string>
     <string name="create_conversation">Opprett samtale</string>
     <string name="create_issue">Opprett problem</string>
@@ -32,6 +33,8 @@
     <string name="dnd">Ikke forstyrr</string>
     <string name="dontClear">Ikke fjern</string>
     <string name="edit">Rediger</string>
+    <string name="edit_error_24_hours_old_message">Kan ikke redigere meldinger som er eldre enn 24 timer</string>
+    <string name="edit_message_icon_description">Ikon for rediger melding</string>
     <string name="emoji_backspace">Tilbake</string>
     <string name="emoji_category_recent">Nylig</string>
     <string name="encrypted">Kryptert</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">Endre sertifikat for autentisering</string>
     <string name="nc_circle">Sirkel</string>
     <string name="nc_circles">Sirkler</string>
+    <string name="nc_clear_edit_button">tøm redigeringsknapp</string>
+    <string name="nc_clear_edit_message">Fjern redigeringsmelding</string>
     <string name="nc_clear_history">Slett alle meldinger</string>
     <string name="nc_clear_history_success">Alle meldinger ble slettet</string>
     <string name="nc_clear_history_warning">Ønsker du virkelig å slette alle meldinger i denne samtalen?</string>
@@ -209,7 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">Ja</string>
     <string name="nc_display_name_not_fetched">Kunne ikke hente visningsnavn, avbryter</string>
     <string name="nc_display_name_not_stored">Kunne ikke lagre visningsnavn, avbryter</string>
+    <string name="nc_edit_icon">Redigeringsikon</string>
     <string name="nc_edit_message">Rediger</string>
+    <string name="nc_edit_message_text">Rediger meldingstekst</string>
+    <string name="nc_edited_by">Redigert av</string>
+    <string name="nc_edited_by_admin">Redigert av administrator</string>
     <string name="nc_email">E-post</string>
     <string name="nc_expire_message_eight_hours">8 timer</string>
     <string name="nc_expire_message_four_weeks">4 uker</string>
@@ -357,6 +366,7 @@
     <string name="nc_search">Søk</string>
     <string name="nc_select_an_account">Velg en konto</string>
     <string name="nc_select_participants">Velg deltakere</string>
+    <string name="nc_send_edit_message">Send redigert melding</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s sendte en GIF.</string>
     <string name="nc_sent_a_gif_you">Du sendte en GIF.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s sendte en video.</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 80ce0303e..e5b282d1f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">Обриши статусну поруку након</string>
     <string name="close">Затвори</string>
     <string name="continuous_voice_message_recording">Закључајте снимање да би се гласовна порука непрестано снимала.</string>
+    <string name="conversation_is_read_only">Овај разговор је само-за-читање</string>
     <string name="conversations">Разговори</string>
     <string name="create_conversation">Креирај разговор</string>
     <string name="create_issue">Креирај проблем</string>
@@ -32,6 +33,8 @@
     <string name="dnd">Не узнемиравај</string>
     <string name="dontClear">Не бриши</string>
     <string name="edit">Измени</string>
+    <string name="edit_error_24_hours_old_message">Не могу да се уређују поруке старије од 24 часова</string>
+    <string name="edit_message_icon_description">Уреди икону поруке</string>
     <string name="emoji_backspace">Брисање улево</string>
     <string name="emoji_category_recent">Недавно</string>
     <string name="encrypted">Шифровано</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">Измени сертификат за пријаву</string>
     <string name="nc_circle">Круг</string>
     <string name="nc_circles">Кругови</string>
+    <string name="nc_clear_edit_button">Обриши дугме за уређивање</string>
+    <string name="nc_clear_edit_message">Обриши Уреди поруку</string>
     <string name="nc_clear_history">Обриши све поруке</string>
     <string name="nc_clear_history_success">Обрисане су све поруке</string>
     <string name="nc_clear_history_warning">Да ли заиста желите да обришете све поруке у овом разговору?</string>
@@ -209,7 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">Да</string>
     <string name="nc_display_name_not_fetched">Име за приказ се не може добавити. Прекидам</string>
     <string name="nc_display_name_not_stored">Не могу да сачувам име за приказ. Прекидам</string>
+    <string name="nc_edit_icon">Уреди икону</string>
     <string name="nc_edit_message">Измени</string>
+    <string name="nc_edit_message_text">Уреди текст поруке</string>
+    <string name="nc_edited_by">Уредио је</string>
+    <string name="nc_edited_by_admin">Уредио је админ</string>
     <string name="nc_email">Е-пошта</string>
     <string name="nc_expire_message_eight_hours">8 сати</string>
     <string name="nc_expire_message_four_weeks">4 недеље</string>
@@ -357,6 +366,7 @@
     <string name="nc_search">Тражи</string>
     <string name="nc_select_an_account">Изаберите налог</string>
     <string name="nc_select_participants">Изабери учеснике</string>
+    <string name="nc_send_edit_message">Пошаљи уређену поруку</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s је послао GIF.</string>
     <string name="nc_sent_a_gif_you">Послали сте GIF.</string>
     <string name="nc_sent_a_video" formatted="true">%1$s је послао видео.</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index a2079a3af..377fa8ce1 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">繼此之後清空狀態訊息</string>
     <string name="close">關閉</string>
     <string name="continuous_voice_message_recording">鎖定錄音以連續錄製語音訊息</string>
+    <string name="conversation_is_read_only">對話是唯讀</string>
     <string name="conversations">對話</string>
     <string name="create_conversation">建立對話</string>
     <string name="create_issue">創建問題</string>
@@ -32,6 +33,8 @@
     <string name="dnd">請勿打擾</string>
     <string name="dontClear">不要清除</string>
     <string name="edit">編輯</string>
+    <string name="edit_error_24_hours_old_message">不能編輯舊於24小時的訊息</string>
+    <string name="edit_message_icon_description">編輯訊息圖示</string>
     <string name="emoji_backspace">Backspace</string>
     <string name="emoji_category_recent">最新</string>
     <string name="encrypted">已加密</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">更改驗證證書</string>
     <string name="nc_circle">社交圈子</string>
     <string name="nc_circles">圈子</string>
+    <string name="nc_clear_edit_button">清除編輯按鈕</string>
+    <string name="nc_clear_edit_message">清除編輯訊息</string>
     <string name="nc_clear_history">刪除所有訊息</string>
     <string name="nc_clear_history_success">已刪除所有訊息</string>
     <string name="nc_clear_history_warning">您確定要刪除對話內所有的訊息嗎？</string>
@@ -209,7 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">是</string>
     <string name="nc_display_name_not_fetched">無法取得顯示名稱，將停止操作。</string>
     <string name="nc_display_name_not_stored">無法儲存顯示名稱，操作中斷。</string>
+    <string name="nc_edit_icon">編輯圖示</string>
     <string name="nc_edit_message">編輯</string>
+    <string name="nc_edit_message_text">編輯訊息文字</string>
+    <string name="nc_edited_by">編輯者</string>
+    <string name="nc_edited_by_admin">編輯由管理員完成</string>
     <string name="nc_email">電郵地址</string>
     <string name="nc_expire_message_eight_hours">8 小时</string>
     <string name="nc_expire_message_four_weeks">4 個星期</string>
@@ -357,6 +366,7 @@
     <string name="nc_search">搜尋</string>
     <string name="nc_select_an_account">選擇一個賬號</string>
     <string name="nc_select_participants">選擇參與者</string>
+    <string name="nc_send_edit_message">傳送編輯訊息</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s 傳送一個 GIF。</string>
     <string name="nc_sent_a_gif_you">您傳送了一個 GIF 檔</string>
     <string name="nc_sent_a_video" formatted="true">%1$s 傳送一個影片</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fcd6bbea3..5c0e321c6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -22,6 +22,7 @@
     <string name="clear_status_message_after">在……之後清空狀態訊息</string>
     <string name="close">關閉</string>
     <string name="continuous_voice_message_recording">鎖定錄音以連續錄製語音訊息</string>
+    <string name="conversation_is_read_only">對話是唯讀</string>
     <string name="conversations">對話</string>
     <string name="create_conversation">建立對話</string>
     <string name="create_issue">建立問題</string>
@@ -32,6 +33,8 @@
     <string name="dnd">請勿打擾</string>
     <string name="dontClear">不要清空</string>
     <string name="edit">編輯</string>
+    <string name="edit_error_24_hours_old_message">無法編輯超過24小時的訊息</string>
+    <string name="edit_message_icon_description">編輯訊息圖示</string>
     <string name="emoji_backspace">Backspace</string>
     <string name="emoji_category_recent">近期</string>
     <string name="encrypted">已加密</string>
@@ -114,6 +117,8 @@
     <string name="nc_change_cert_auth">變更驗證憑證</string>
     <string name="nc_circle">圈子</string>
     <string name="nc_circles">圈子</string>
+    <string name="nc_clear_edit_button">清除編輯按鈕</string>
+    <string name="nc_clear_edit_message">清除編輯訊息</string>
     <string name="nc_clear_history">刪除所有訊息</string>
     <string name="nc_clear_history_success">已刪除所有訊息</string>
     <string name="nc_clear_history_warning">您確定要刪除對話內所有的訊息嗎？</string>
@@ -209,7 +214,11 @@
     <string name="nc_dialog_save_to_storage_yes">是</string>
     <string name="nc_display_name_not_fetched">無法取得顯示名稱，將停止動作。</string>
     <string name="nc_display_name_not_stored">無法儲存顯示名稱，操作中斷。</string>
+    <string name="nc_edit_icon">編輯圖示</string>
     <string name="nc_edit_message">編輯</string>
+    <string name="nc_edit_message_text">編輯訊息文字</string>
+    <string name="nc_edited_by">編輯者</string>
+    <string name="nc_edited_by_admin">由管理員編輯</string>
     <string name="nc_email">電子郵件</string>
     <string name="nc_expire_message_eight_hours">8小時</string>
     <string name="nc_expire_message_four_weeks">4 週</string>
@@ -357,6 +366,7 @@
     <string name="nc_search">搜尋</string>
     <string name="nc_select_an_account">選擇一個帳號</string>
     <string name="nc_select_participants">選取參與者</string>
+    <string name="nc_send_edit_message">傳送編輯訊息</string>
     <string name="nc_sent_a_gif" formatted="true">%1$s 傳送一個 GIF.</string>
     <string name="nc_sent_a_gif_you">您傳送了一個 GIF 檔</string>
     <string name="nc_sent_a_video" formatted="true">%1$s 傳送一個影片</string>