diff --git a/res/drawable-hdpi/ic_action_copy_dark.png b/res/drawable-hdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..72c6bc6e2
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-hdpi/ic_action_copy_light.png b/res/drawable-hdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..623b71504
Binary files /dev/null and b/res/drawable-hdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_dark.png b/res/drawable-hdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-hdpi/ic_action_move_dark.png
diff --git a/res/drawable-hdpi/ic_action_move_or_copy_light.png b/res/drawable-hdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-hdpi/ic_action_move_or_copy_light.png
rename to res/drawable-hdpi/ic_action_move_light.png
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_dark.png b/res/drawable-ldpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_move_or_copy_dark.png
rename to res/drawable-ldpi/ic_action_move_dark.png
diff --git a/res/drawable-ldpi/ic_action_move_or_copy_light.png b/res/drawable-ldpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-ldpi/ic_action_move_or_copy_light.png
rename to res/drawable-ldpi/ic_action_move_light.png
diff --git a/res/drawable-mdpi/ic_action_copy_dark.png b/res/drawable-mdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..d93968e5b
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-mdpi/ic_action_copy_light.png b/res/drawable-mdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..efb2445f0
Binary files /dev/null and b/res/drawable-mdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_dark.png b/res/drawable-mdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-mdpi/ic_action_move_dark.png
diff --git a/res/drawable-mdpi/ic_action_move_or_copy_light.png b/res/drawable-mdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-mdpi/ic_action_move_or_copy_light.png
rename to res/drawable-mdpi/ic_action_move_light.png
diff --git a/res/drawable-xhdpi/ic_action_copy_dark.png b/res/drawable-xhdpi/ic_action_copy_dark.png
new file mode 100644
index 000000000..04e290d8b
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_dark.png differ
diff --git a/res/drawable-xhdpi/ic_action_copy_light.png b/res/drawable-xhdpi/ic_action_copy_light.png
new file mode 100644
index 000000000..00bff33c7
Binary files /dev/null and b/res/drawable-xhdpi/ic_action_copy_light.png differ
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_dark.png b/res/drawable-xhdpi/ic_action_move_dark.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_move_or_copy_dark.png
rename to res/drawable-xhdpi/ic_action_move_dark.png
diff --git a/res/drawable-xhdpi/ic_action_move_or_copy_light.png b/res/drawable-xhdpi/ic_action_move_light.png
similarity index 100%
rename from res/drawable-xhdpi/ic_action_move_or_copy_light.png
rename to res/drawable-xhdpi/ic_action_move_light.png
diff --git a/res/menu/message_list_context.xml b/res/menu/message_list_context.xml
index 89c1007aa..33b12b594 100644
--- a/res/menu/message_list_context.xml
+++ b/res/menu/message_list_context.xml
@@ -28,11 +28,12 @@
android:id="@+id/move"
android:title="@string/move_action"
android:showAsAction="ifRoom"
- android:icon="?attr/iconActionMoveOrCopy"
+ android:icon="?attr/iconActionMove"
/>
+
+
+
+
+
+
+
+
-
@@ -204,7 +222,7 @@
android:id="@+id/toggle_message_view_theme"
android:showAsAction="never"
android:title="@string/message_view_theme_action_dark"/>
-
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9858a5ddc..dc108fa98 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -10,7 +10,8 @@
-
+
+
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 946cdb45f..94f55d6b2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1153,4 +1153,7 @@ Please submit bug reports, contribute new features and ask questions at
Mark all as read
Colorize missing contact pictures
+
+ Visisble message actions
+ Show selected actions in the message view menu
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 017c3eb0c..a8bbb9a66 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -12,7 +12,8 @@
- @drawable/ic_action_archive_light
- @drawable/ic_action_compose_light
- @drawable/ic_action_delete_light
- - @drawable/ic_action_move_or_copy_light
+ - @drawable/ic_action_move_light
+ - @drawable/ic_action_copy_light
- @drawable/ic_action_next_message_light
- @drawable/ic_action_previous_message_light
- @drawable/ic_action_refresh_light
@@ -63,7 +64,8 @@
- @drawable/ic_action_archive_dark
- @drawable/ic_action_compose_dark
- @drawable/ic_action_delete_dark
- - @drawable/ic_action_move_or_copy_dark
+ - @drawable/ic_action_move_dark
+ - @drawable/ic_action_copy_dark
- @drawable/ic_action_next_message_dark
- @drawable/ic_action_previous_message_dark
- @drawable/ic_action_refresh_dark
diff --git a/res/xml/global_preferences.xml b/res/xml/global_preferences.xml
index 55972b7dd..3ccbb09b1 100644
--- a/res/xml/global_preferences.xml
+++ b/res/xml/global_preferences.xml
@@ -225,6 +225,15 @@
android:title="@string/global_settings_messageview_fixedwidth_label"
android:summary="@string/global_settings_messageview_fixedwidth_summary" />
+
+
validate(int version, Map> settings,