diff --git a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
index 84f91078a..7964aea73 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/MuteDialog.java
@@ -38,10 +38,10 @@ public class MuteDialog extends AlertDialog {
 
         switch (which) {
           case 0:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
-          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(2);  break;
+          case 1:  muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(8);  break;
           case 2:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(1);   break;
           case 3:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(7);   break;
-          case 4:  muteUntil = System.currentTimeMillis() + TimeUnit.DAYS.toMillis(365); break;
+          case 4:  muteUntil = Long.MAX_VALUE;                                           break;
           default: muteUntil = System.currentTimeMillis() + TimeUnit.HOURS.toMillis(1);  break;
         }
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
index 7631539f3..95afd34ea 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/managegroup/ManageGroupFragment.java
@@ -333,10 +333,14 @@ public class ManageGroupFragment extends LoggingFragment {
       muteNotificationsUntilLabel.setVisibility(muteState.isMuted() ? View.VISIBLE : View.GONE);
 
       if (muteState.isMuted()) {
-        muteNotificationsUntilLabel.setText(getString(R.string.ManageGroupActivity_until_s,
-                                                      DateUtils.getTimeString(requireContext(),
-                                                                              Locale.getDefault(),
-                                                                              muteState.getMutedUntil())));
+        if (muteState.getMutedUntil() == Long.MAX_VALUE) {
+          muteNotificationsUntilLabel.setText(R.string.ManageGroupActivity_always);
+        } else {
+          muteNotificationsUntilLabel.setText(getString(R.string.ManageGroupActivity_until_s,
+                                                        DateUtils.getTimeString(requireContext(),
+                                                                                Locale.getDefault(),
+                                                                                muteState.getMutedUntil())));
+        }
       }
     });
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java
index 02d80d822..b5b844890 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/managerecipient/ManageRecipientFragment.java
@@ -373,10 +373,14 @@ public class ManageRecipientFragment extends LoggingFragment {
     muteNotificationsUntilLabel.setVisibility(muteState.isMuted() ? View.VISIBLE : View.GONE);
 
     if (muteState.isMuted()) {
-      muteNotificationsUntilLabel.setText(getString(R.string.ManageRecipientActivity_until_s,
-                                                    DateUtils.getTimeString(requireContext(),
-                                                                            Locale.getDefault(),
-                                                                            muteState.getMutedUntil())));
+      if (muteState.getMutedUntil() == Long.MAX_VALUE) {
+        muteNotificationsUntilLabel.setText(R.string.ManageRecipientActivity_always);
+      } else {
+        muteNotificationsUntilLabel.setText(getString(R.string.ManageRecipientActivity_until_s,
+                                                      DateUtils.getTimeString(requireContext(),
+                                                                              Locale.getDefault(),
+                                                                              muteState.getMutedUntil())));
+      }
     }
   }
 
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d679e95e8..a247be719 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -232,10 +232,10 @@
 
   <string-array name="mute_durations">
       <item>@string/arrays__mute_for_one_hour</item>
-      <item>@string/arrays__mute_for_two_hours</item>
+      <item>@string/arrays__mute_for_eight_hours</item>
       <item>@string/arrays__mute_for_one_day</item>
       <item>@string/arrays__mute_for_seven_days</item>
-      <item>@string/arrays__mute_for_one_year</item>
+      <item>@string/arrays__always</item>
   </string-array>
 
   <string-array name="recipient_vibrate_entries">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11d5b8f5c..1318a5c50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -709,6 +709,7 @@
     <string name="ManageGroupActivity_mentions">Mentions</string>
     <string name="ManageGroupActivity_chat_wallpaper">Chat wallpaper</string>
     <string name="ManageGroupActivity_until_s">Until %1$s</string>
+    <string name="ManageGroupActivity_always">Always</string>
     <string name="ManageGroupActivity_off">Off</string>
     <string name="ManageGroupActivity_on">On</string>
     <string name="ManageGroupActivity_view_all_members">View all members</string>
@@ -766,6 +767,7 @@
     <string name="ManageRecipientActivity_mute_notifications">Mute notifications</string>
     <string name="ManageRecipientActivity_custom_notifications">Custom notifications</string>
     <string name="ManageRecipientActivity_until_s">Until %1$s</string>
+    <string name="ManageRecipientActivity_always">Always</string>
     <string name="ManageRecipientActivity_off">Off</string>
     <string name="ManageRecipientActivity_on">On</string>
     <string name="ManageRecipientActivity_add_to_a_group">Add to a group</string>
@@ -2147,10 +2149,10 @@
     <string name="arrays__use_custom">Use custom</string>
 
     <string name="arrays__mute_for_one_hour">Mute for 1 hour</string>
-    <string name="arrays__mute_for_two_hours">Mute for 2 hours</string>
+    <string name="arrays__mute_for_eight_hours">Mute for 8 hours</string>
     <string name="arrays__mute_for_one_day">Mute for 1 day</string>
     <string name="arrays__mute_for_seven_days">Mute for 7 days</string>
-    <string name="arrays__mute_for_one_year">Mute for 1 year</string>
+    <string name="arrays__always">Always</string>
 
     <string name="arrays__settings_default">Settings default</string>
     <string name="arrays__enabled">Enabled</string>