diff --git a/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java b/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java
index 1df5edf01..b92623676 100644
--- a/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java
+++ b/app/src/main/java/org/isoron/uhabits/helpers/DateHelper.java
@@ -28,7 +28,9 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
 
 public class DateHelper
@@ -230,6 +232,20 @@ public class DateHelper
         return dayNumbers;
     }
 
+    /**
+     * here we create the mapping of week days numbers into the "wdays"-indices
+     *
+     * @see DateHelper#getDayNames(int)
+     */
+    public static Map<Integer, Integer> getWeekdayMap()
+    {
+        Map<Integer, Integer> number2wdays = new HashMap<>();
+        for (Integer number : getLocaleWeekdayList()) {
+            number2wdays.put(number, number % 7);
+        }
+        return number2wdays;
+    }
+
     public static String formatWeekdayList(Context context, boolean weekday[])
     {
         String shortDayNames[] = getShortDayNames();
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java b/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java
index cdca6c97c..1f1f712e5 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitFrequencyView.java
@@ -35,6 +35,7 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 
 public class HabitFrequencyView extends ScrollableDataView implements HabitDataView
@@ -64,7 +65,7 @@ public class HabitFrequencyView extends ScrollableDataView implements HabitDataV
     private HashMap<Long, Integer[]> frequency;
     private String wdays[];
     private Integer[] localeWeekdayList;
-    private HashMap<Integer, Integer> number2wdays;
+    private Map<Integer, Integer> number2wdays;
 
     public HabitFrequencyView(Context context)
     {
@@ -98,11 +99,7 @@ public class HabitFrequencyView extends ScrollableDataView implements HabitDataV
          * @see DateHelper#getDayNames(int)
          */
         localeWeekdayList = DateHelper.getLocaleWeekdayList();
-        number2wdays = new HashMap<>();
-        for (Integer number : localeWeekdayList) {
-            int wdaysIndex = number % 7;
-            number2wdays.put(number, wdaysIndex);
-        }
+        number2wdays = DateHelper.getWeekdayMap();
 
         dfMonth = DateHelper.getDateFormat("MMM");
         dfYear = DateHelper.getDateFormat("yyyy");
diff --git a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
index 599d0223d..17af430f5 100644
--- a/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
+++ b/app/src/main/java/org/isoron/uhabits/views/HabitHistoryView.java
@@ -41,6 +41,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.Random;
 
 public class HabitHistoryView extends ScrollableDataView implements HabitDataView,
@@ -60,7 +61,7 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
 
     private String wdays[];
     private Integer[] localeWeekdayList;
-    private HashMap<Integer, Integer> number2wdays;
+    private Map<Integer, Integer> number2wdays;
     private SimpleDateFormat dfMonth;
     private SimpleDateFormat dfYear;
 
@@ -105,16 +106,8 @@ public class HabitHistoryView extends ScrollableDataView implements HabitDataVie
         dfMonth = DateHelper.getDateFormat("MMM");
         dfYear = DateHelper.getDateFormat("yyyy");
 
-        /**
-         * here we create the mapping of week days numbers into the "wdays"-indices
-         * @see DateHelper#getDayNames(int)
-         */
         localeWeekdayList = DateHelper.getLocaleWeekdayList();
-        number2wdays = new HashMap<>();
-        for (Integer number : localeWeekdayList) {
-            int wdaysIndex = number % 7;
-            number2wdays.put(number, wdaysIndex);
-        }
+        number2wdays = DateHelper.getWeekdayMap();
 
         baseLocation = new RectF();
     }