diff --git a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
index f1979828c8b382f880caf66904e06cff68eb123e..d73249f4b96514536db1e46cab230c881d4157c0 100644
--- a/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SearchActivity.java
@@ -121,6 +121,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc
 		}
 		searchField.addTextChangedListener(this);
 		searchField.setHint(R.string.search_messages);
+		searchField.setContentDescription(getString(R.string.search_messages));
 		searchField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE);
 		if (term == null) {
 			showKeyboard(searchField);
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 4d31d74d617dcc4c5d74df57f9e81220bed020c1..fa0d5ada9dfb0438aab69abac5d2dd88a3f6b781 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -621,8 +621,10 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
 		}
 		if (binding.startConversationViewPager.getCurrentItem() == 0) {
 			mSearchEditText.setHint(R.string.search_contacts);
+			mSearchEditText.setContentDescription(getString(R.string.search_contacts));
 		} else {
 			mSearchEditText.setHint(R.string.search_bookmarks);
+			mSearchEditText.setContentDescription(getString(R.string.search_bookmarks));
 		}
 	}
 
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 294807bea471eb808a9fd95c83ee07051aae7521..9cad4d1bf503a768701a4ee8f0fe388605b2fe43 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -28,7 +28,7 @@
         android:id="@+id/action_security"
         android:icon="?attr/icon_not_secure"
         android:orderInCategory="20"
-        android:title="@string/action_secure"
+        android:title="@string/encrypted_with_omemo"
         app:showAsAction="always">
         <menu>
             <group android:checkableBehavior="single">