diff --git a/app/src/main/java/eu/faircode/email/EntityRule.java b/app/src/main/java/eu/faircode/email/EntityRule.java
index b74153ef09..31b352ebd5 100644
--- a/app/src/main/java/eu/faircode/email/EntityRule.java
+++ b/app/src/main/java/eu/faircode/email/EntityRule.java
@@ -370,7 +370,7 @@ public class EntityRule {
             cal.set(Calendar.HOUR_OF_DAY, hour);
             cal.set(Calendar.MINUTE, minute);
             cal.set(Calendar.SECOND, 0);
-            wakeup = cal.getTimeInMillis();
+            wakeup = cal.getTimeInMillis() + duration * 3600 * 1000L;
         } else
             wakeup = message.received + duration * 3600 * 1000L;
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentRule.java b/app/src/main/java/eu/faircode/email/FragmentRule.java
index e0be0950e1..8b49953da2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentRule.java
+++ b/app/src/main/java/eu/faircode/email/FragmentRule.java
@@ -347,15 +347,8 @@ public class FragmentRule extends FragmentBase {
             }
         });
 
-        npDuration.setMinValue(1);
-        npDuration.setMaxValue(99);
-
-        cbScheduleEnd.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                npDuration.setEnabled(!checked);
-            }
-        });
+        npDuration.setMinValue(0);
+        npDuration.setMaxValue(999);
 
         tvActionRemark.setVisibility(View.GONE);
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c3ee244afc..ad91b156a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -643,7 +643,7 @@
     <string name="title_rule_action">Action</string>
     <string name="title_rule_action_remark">This action will be applied to new messages arriving in the folder %1$s</string>
     <string name="title_rule_hours">Hours</string>
-    <string name="title_rule_schedule_end">Until the end of the time condition</string>
+    <string name="title_rule_schedule_end">From the end of the time condition</string>
     <string name="title_rule_folder">Folder</string>
     <string name="title_rule_thread">All messages in same conversation and folder</string>
     <string name="title_rule_identity">Identity</string>