diff --git a/app/src/main/res/layout/fragment_options.xml b/app/src/main/res/layout/fragment_options.xml
index 938369d8f5..2aee619192 100644
--- a/app/src/main/res/layout/fragment_options.xml
+++ b/app/src/main/res/layout/fragment_options.xml
@@ -225,6 +225,20 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvDownload" />
 
+        <TextView
+            android:id="@+id/tvRoamingHint"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="60dp"
+            android:text="@string/title_advanced_roaming_hint"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textStyle="italic"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/spDownload" />
+
         <TextView
             android:id="@+id/tvSectionDisplay"
             android:layout_width="wrap_content"
@@ -234,7 +248,7 @@
             android:text="@string/title_advanced_section_display"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/spDownload" />
+            app:layout_constraintTop_toBottomOf="@id/tvRoamingHint" />
 
         <View
             android:id="@+id/vSeparatorDisplay"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eff06e7290..0fd2654138 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -206,6 +206,7 @@
     <string name="title_advanced_enabled_hint">Globally disable or enable receiving and sending of messages</string>
     <string name="title_advanced_metered_hint">Metered connections are generally mobile connections or paid Wi-Fi hotspots</string>
     <string name="title_advanced_metered_warning">Disabling this option will disable receiving and sending messages on mobile internet connections</string>
+    <string name="title_advanced_roaming_hint">Message texts and attachments will never be downloaded when roaming</string>
     <string name="title_advanced_browse_hint">Fetch more messages when scrolling down</string>
     <string name="title_advanced_threading_hint">Group messages related to each other</string>
     <string name="title_advanced_name_email_hint">When disabled only names will be shown when available</string>