diff --git a/app/src/main/java/eu/faircode/email/FragmentFolder.java b/app/src/main/java/eu/faircode/email/FragmentFolder.java
index 11be8dfa33..05809aaaf4 100644
--- a/app/src/main/java/eu/faircode/email/FragmentFolder.java
+++ b/app/src/main/java/eu/faircode/email/FragmentFolder.java
@@ -251,7 +251,6 @@ public class FragmentFolder extends FragmentBase {
                     cbSynchronize.setChecked(folder == null || folder.synchronize);
                     cbPoll.setChecked(folder == null ? false : folder.poll);
                     etPoll.setText(folder == null ? null : Integer.toString(folder.poll_factor));
-                    etPoll.setHint(Integer.toString(EntityAccount.DEFAULT_POLL_INTERVAL));
                     tvPoll.setText(getString(R.string.title_factor_minutes, interval));
                     grpPoll.setVisibility(cbPoll.isChecked() ? View.VISIBLE : View.GONE);
                     cbDownload.setChecked(folder == null ? true : folder.download);
@@ -440,7 +439,7 @@ public class FragmentFolder extends FragmentBase {
                 int keep_days = (TextUtils.isEmpty(keep) ? EntityFolder.DEFAULT_KEEP : Integer.parseInt(keep));
                 if (keep_days < sync_days)
                     keep_days = sync_days;
-                int poll_factor = (TextUtils.isEmpty(factor) ? EntityAccount.DEFAULT_POLL_INTERVAL : Integer.parseInt(factor));
+                int poll_factor = (TextUtils.isEmpty(factor) ? 1 : Integer.parseInt(factor));
                 if (poll_factor < 1)
                     poll_factor = 1;
 
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index 81276ace34..1faec624c6 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -154,21 +154,35 @@
 
         <EditText
             android:id="@+id/etPoll"
-            android:layout_width="100dp"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="24dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginEnd="12dp"
+            android:gravity="end"
+            android:hint="1"
             android:inputType="number"
+            android:text="1"
+            app:layout_constraintEnd_toStartOf="@+id/tvMultiply"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cbPoll" />
 
+        <TextView
+            android:id="@+id/tvMultiply"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="12dp"
+            android:text="&#215;"
+            app:layout_constraintBottom_toBottomOf="@+id/etPoll"
+            app:layout_constraintEnd_toStartOf="@+id/tvPoll"
+            app:layout_constraintTop_toTopOf="@+id/etPoll" />
+
         <TextView
             android:id="@+id/tvPoll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:text="x 15 min"
+            android:text="@string/title_factor_minutes"
             app:layout_constraintBottom_toBottomOf="@+id/etPoll"
-            app:layout_constraintStart_toEndOf="@+id/etPoll"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@+id/etPoll" />
 
         <CheckBox
@@ -321,6 +335,6 @@
             android:id="@+id/grpPoll"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="etPoll,tvPoll" />
+            app:constraint_referenced_ids="etPoll,tvMultiply,tvPoll" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dae72458ac..94c69f663c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -99,7 +99,7 @@
     <string name="title_notification_alert">\'%1$s\' server alert</string>
 
     <string name="title_name_count">%1$s (%2$s)</string>
-    <string name="title_factor_minutes" translatable="false">X %1$d minutes</string>
+    <string name="title_factor_minutes">%1$d minutes</string>
 
     <string name="menu_exit">Exit</string>
     <string name="menu_answers">Templates</string>