diff --git a/app/src/main/res/layout/dialog_send.xml b/app/src/main/res/layout/dialog_send.xml
index 03f7ae9c4b..59ccc48da5 100644
--- a/app/src/main/res/layout/dialog_send.xml
+++ b/app/src/main/res/layout/dialog_send.xml
@@ -116,6 +116,8 @@
android:id="@+id/ibSendAt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:contentDescription="@string/title_send_at"
+ android:tooltipText="@string/title_send_at"
app:layout_constraintBottom_toBottomOf="@id/tvSendAt"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/baseline_timelapse_24" />
diff --git a/app/src/main/res/layout/include_message_addresses.xml b/app/src/main/res/layout/include_message_addresses.xml
index 58909532f3..f161d21aac 100644
--- a/app/src/main/res/layout/include_message_addresses.xml
+++ b/app/src/main/res/layout/include_message_addresses.xml
@@ -31,6 +31,8 @@
android:layout_height="wrap_content"
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:contentDescription="@string/title_legend_similar"
+ android:tooltipText="@string/title_legend_similar"
app:layout_constraintEnd_toStartOf="@+id/ibNotifyContact"
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
app:srcCompat="@drawable/baseline_search_24" />
@@ -42,6 +44,7 @@
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_notify"
+ android:tooltipText="@string/title_legend_notify"
app:layout_constraintEnd_toStartOf="@+id/ibAddContact"
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
app:srcCompat="@drawable/baseline_notifications_24" />
@@ -53,6 +56,7 @@
android:layout_marginEnd="12dp"
android:background="?android:attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/title_legend_contacts"
+ android:tooltipText="@string/title_legend_contacts"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/ibExpanderAddress"
app:srcCompat="@drawable/baseline_import_contacts_24" />
diff --git a/app/src/main/res/layout/include_message_navigation.xml b/app/src/main/res/layout/include_message_navigation.xml
index 3a29721864..0c4d9c3f49 100644
--- a/app/src/main/res/layout/include_message_navigation.xml
+++ b/app/src/main/res/layout/include_message_navigation.xml
@@ -27,6 +27,7 @@
android:backgroundTint="?attr/colorActionBackground"
android:contentDescription="@string/title_decrypt"
android:tint="@color/action_foreground"
+ android:tooltipText="@string/title_decrypt"
app:layout_constraintEnd_toStartOf="@+id/ibUnsubscribe"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_no_encryption_24" />
@@ -40,6 +41,7 @@
android:backgroundTint="?attr/colorActionBackground"
android:contentDescription="@string/title_legend_show_unsubscribe"
android:tint="@color/action_foreground"
+ android:tooltipText="@string/title_legend_show_unsubscribe"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_unsubscribe_24" />
@@ -53,6 +55,7 @@
android:backgroundTint="?attr/colorActionBackground"
android:contentDescription="@string/title_legend_show_images"
android:tint="@color/action_foreground"
+ android:tooltipText="@string/title_legend_show_images"
app:layout_constraintEnd_toStartOf="@+id/ibFull"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_image_24" />
@@ -65,6 +68,7 @@
android:backgroundTint="?attr/colorActionBackground"
android:contentDescription="@string/title_legend_show_full"
android:tint="@color/action_foreground"
+ android:tooltipText="@string/title_legend_show_full"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions"
app:srcCompat="@drawable/baseline_fullscreen_24" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e696cc225b..64bfcd830f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -713,6 +713,7 @@
Primary
Subscribed to
Has rules
+ Search similar messages
Notify on new messages
Number of days to synchronize / to keep messages
Number of message downloaded / headers fetched