diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
index 6670f6db..da7f25da 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/ReminderPreferences.java
@@ -36,8 +36,7 @@ import java.util.List;
 import java.util.Set;
 
 public class ReminderPreferences extends PreferenceFragment
-        implements SharedPreferences.OnSharedPreferenceChangeListener
-{
+        implements SharedPreferences.OnSharedPreferenceChangeListener {
 
     public static final String PREFERENCE_KEY_REMINDER_NOTIFY_TEXT = "reminderNotifyText";
     public static final String PREFERENCE_KEY_REMINDER_WEEKDAYS = "reminderWeekdays";
@@ -45,10 +44,6 @@ public class ReminderPreferences extends PreferenceFragment
     private static final String PREFERENCE_KEY_REMINDER_ENABLE = "reminderEnable";
 
     private CheckBoxPreference reminderEnable;
-    private MultiSelectListPreference reminderWeekdays;
-    private TimePreferenceDialog reminderTime;
-    private EditTextPreference reminderNotifyText;
-
 
     @Override
     public void onCreate(Bundle savedInstanceState)
@@ -58,9 +53,6 @@ public class ReminderPreferences extends PreferenceFragment
         addPreferencesFromResource(R.xml.reminder_preferences);
 
         reminderEnable = (CheckBoxPreference) findPreference(PREFERENCE_KEY_REMINDER_ENABLE);
-        reminderWeekdays = (MultiSelectListPreference) findPreference(PREFERENCE_KEY_REMINDER_WEEKDAYS);
-        reminderTime = (TimePreferenceDialog) findPreference(PREFERENCE_KEY_REMINDER_TIME);
-        reminderNotifyText = (EditTextPreference) findPreference(PREFERENCE_KEY_REMINDER_NOTIFY_TEXT);
 
         updateAlarmPreferences();
         initSummary(getPreferenceScreen());
@@ -109,28 +101,18 @@ public class ReminderPreferences extends PreferenceFragment
         PackageManager pm = getActivity().getApplicationContext().getPackageManager();
 
         AlarmHandler alarmHandler = new AlarmHandler();
-        if (reminderEnable.isChecked())
-        {
+        if (reminderEnable.isChecked()) {
             alarmHandler.scheduleAlarms(getActivity());
 
             pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                     PackageManager.DONT_KILL_APP);
-
-            reminderWeekdays.setEnabled(true);
-            reminderTime.setEnabled(true);
-            reminderNotifyText.setEnabled(true);
         }
-        else
-        {
+        else {
             alarmHandler.disableAllAlarms(getActivity());
 
             pm.setComponentEnabledSetting(receiver, PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
                     PackageManager.DONT_KILL_APP);
-
-            reminderWeekdays.setEnabled(false);
-            reminderTime.setEnabled(false);
-            reminderNotifyText.setEnabled(false);
-        }
+            }
     }
 
     private void updatePrefSummary(Preference p)
diff --git a/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java b/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java
index 9d7b6df1..048a6094 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/preferences/TimePreferenceDialog.java
@@ -108,8 +108,4 @@ public class TimePreferenceDialog extends DialogPreference {
         }
         return DateFormat.getTimeFormat(getContext()).format(calendar.getTime());
     }
-
-    public long getTimeInMillis() {
-        return calendar.getTimeInMillis();
-    }
 }
\ No newline at end of file
diff --git a/android_app/app/src/main/res/xml/reminder_preferences.xml b/android_app/app/src/main/res/xml/reminder_preferences.xml
index a4f89944..1941279d 100644
--- a/android_app/app/src/main/res/xml/reminder_preferences.xml
+++ b/android_app/app/src/main/res/xml/reminder_preferences.xml
@@ -9,24 +9,21 @@
 
     <MultiSelectListPreference
         android:defaultValue="@array/weekdays_default"
+        android:dependency="reminderEnable"
         android:dialogTitle="@string/label_reminder_weekdays"
-        android:enabled="false"
         android:entries="@array/weekdays_entries"
         android:entryValues="@array/weekdays_values"
         android:key="reminderWeekdays"
-        android:title="@string/label_reminder_weekdays"
-        />
+        android:title="@string/label_reminder_weekdays" />
 
     <com.health.openscale.gui.preferences.TimePreferenceDialog
-        android:enabled="false"
+        android:dependency="reminderEnable"
         android:key="reminderTime"
-        android:title="@string/label_reminder_time"
-        />
+        android:title="@string/label_reminder_time" />
 
     <EditTextPreference
         android:defaultValue="@string/default_value_reminder_notify_text"
-        android:enabled="false"
+        android:dependency="reminderEnable"
         android:key="reminderNotifyText"
-        android:title="@string/label_reminder_notify_text"
-        />
-</PreferenceScreen>
\ No newline at end of file
+        android:title="@string/label_reminder_notify_text" />
+</PreferenceScreen>