diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 256ade15e..5ff7d3021 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -799,19 +799,19 @@ How to translate with transifex:
     <string name="nc_caption">Caption</string>
     <string name="languages_error_title">Retrieval failed</string>
     <string name="languages_error_message">Languages could not be retrieved</string>
-    <string name="edit_message_icon_description">Edit message icon</string>
+    <string name="edit_message_icon_description">Edit message</string>
     <string name="nc_edit_message">Edit</string>
-    <string name="nc_send_edit_message">Send edit message</string>
-    <string name="nc_clear_edit_message">Clear edit message</string>
-    <string name="edit_error_24_hours_old_message">Cannot Edit Messages older than 24 hours</string>
+    <string name="nc_send_edit_message">Update message</string>
+    <string name="nc_clear_edit_message">Cancel editing</string>
+    <string name="edit_error_24_hours_old_message">Messages older than 24 hours can not be edited</string>
     <string name="conversation_is_read_only">Conversation is read only</string>
-    <string name="nc_edit_message_text">Edit message text</string>
+    <string name="nc_edit_message_text">Edit message</string>
     <string name="hint_edited_message">(edited)</string>
     <string name="nc_conversation_not_found">Conversation not found</string>
     <string name="add_to_notes">Add to Notes</string>
     <string name="nc_edited_by_admin">Edited by admin</string>
-    <string name="nc_clear_edit_button">Clear edit button</string>
-    <string name="nc_edit_icon">Edit icon</string>
+    <string name="nc_clear_edit_button">Cancel editing</string>
+    <string name="nc_edit_icon">Edit</string>
     <string name="get_invitations_error">Failed to fetch pending invitations</string>
     <string name="message_last_edited_by">Edited by %1$s</string>
     <string name="share_link_to_conversation">Join conversation %1$s at %2$s</string>