diff --git a/vector/lint.xml b/vector/lint.xml
index 572f937406..2ec7f44d7a 100644
--- a/vector/lint.xml
+++ b/vector/lint.xml
@@ -17,6 +17,9 @@
     <issue id="ButtonOrder" severity="error" />
     <issue id="TextFields" severity="error" />
 
+    <!-- Accessibility -->
+    <issue id="LabelFor" severity="error" />
+
     <!-- Layout -->
     <issue id="UnknownIdInLayout" severity="error" />
     <issue id="StringFormatCount" severity="error" />
diff --git a/vector/src/main/res/layout/dialog_base_edit_text.xml b/vector/src/main/res/layout/dialog_base_edit_text.xml
index 1c4695a815..5c3255060c 100644
--- a/vector/src/main/res/layout/dialog_base_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_base_edit_text.xml
@@ -12,6 +12,7 @@
         android:id="@+id/editText"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:hint="@string/dialog_edit_hint"
         android:inputType="text">
 
         <requestFocus />
diff --git a/vector/src/main/res/layout/dialog_preference_edit_text.xml b/vector/src/main/res/layout/dialog_preference_edit_text.xml
index a6c570f751..3933231a34 100644
--- a/vector/src/main/res/layout/dialog_preference_edit_text.xml
+++ b/vector/src/main/res/layout/dialog_preference_edit_text.xml
@@ -20,6 +20,7 @@
             android:id="@android:id/edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:hint="@string/dialog_edit_hint"
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             tools:ignore="TextFields" />
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index a441fee3be..d3b69043da 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -64,6 +64,7 @@
                     android:id="@+id/loginServerUrlFormHomeServerUrl"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:hint="@string/hs_url"
                     android:imeOptions="actionDone"
                     android:inputType="textUri"
                     android:maxLines="1" />
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 3fbd233888..e235e5eb70 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -144,6 +144,8 @@
     <string name="dialog_title_error">Error</string>
     <string name="dialog_title_success">Success</string>
 
+    <string name="dialog_edit_hint">New value</string>
+
     <!-- Bottom navigation buttons -->
     <string name="bottom_action_home">Home</string>
     <string name="bottom_action_notification">Notifications</string>