diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index c73f4feb7..959367192 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -276,6 +276,8 @@
   
   <string name="p_time_increment">p_time_increment</string>
   
+  <string name="p_use_date_shortcuts">p_use_date_shortcuts</string>
+  
   <!-- Configurations -->
   <string name="p_configurations">p_configurations</string>
   <string name="p_config_default">p_config_default</string>
diff --git a/astrid/res/values/strings-core.xml b/astrid/res/values/strings-core.xml
index bd93a7bce..4900b6430 100644
--- a/astrid/res/values/strings-core.xml
+++ b/astrid/res/values/strings-core.xml
@@ -674,6 +674,8 @@
   
   <string name="EPr_time_increment">5 minute increments</string>
   
+  <string name="EPr_use_date_shortcuts">Use date shortcuts</string>
+  
   <!-- slide 35h -->
   <string name="EPr_beastMode_desc">Customize the layout of the task edit screen</string>
   <!-- slide 35j -->
diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index 54936a70f..4d402a24c 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -76,6 +76,11 @@
 	            android:title="@string/EPr_show_task_edit_comments"
 	            android:defaultValue="true"/>
 	        
+	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
+	            android:key="@string/p_use_date_shortcuts"
+	            android:title="@string/EPr_use_date_shortcuts"
+	            android:defaultValue="true"/>
+	        
 	        <com.todoroo.astrid.ui.MultilineCheckboxPreference
                 android:key="@string/p_time_increment"
                 android:title="@string/EPr_time_increment"
diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
index 585d537a7..9dbed1ec7 100644
--- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
+++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTests.java
@@ -154,7 +154,10 @@ public class ABTests {
 
     public static final String AB_NEW_LOGIN_YES_GOOGLE = "android_new_login_y_google"; //$NON-NLS-1$
 
+    public static final String AB_USE_DATE_SHORTCUTS = "android_use_date_shortcuts"; //$NON-NLS-1$
+
     private void initialize() {
-        //
+        addTest(AB_USE_DATE_SHORTCUTS, new int[] { 1, 1 },
+                new int[] { 1, 1 }, new String[] { "date-shortcuts-off", "date-shortcuts-on" }, true); //$NON-NLS-1$ //$NON-NLS-2$
     }
 }
diff --git a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
index b980f1953..fb1bcf794 100644
--- a/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/AstridTimePicker.java
@@ -45,7 +45,7 @@ public class AstridTimePicker extends LinearLayout {
     public AstridTimePicker(Context context, AttributeSet attrs) {
         super(context, attrs);
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        useShortcuts = false; //Preferences.getBoolean(R.string.p_use_date_shortcuts, true);
+        useShortcuts = Preferences.getBoolean(R.string.p_use_date_shortcuts, true);
         int layout = useShortcuts ? R.layout.astrid_time_picker : R.layout.astrid_time_picker_horizontal;
         inflater.inflate(layout, this, true);
 
diff --git a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
index 0d744fdb8..b8d7a8180 100644
--- a/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/DateAndTimePicker.java
@@ -22,6 +22,7 @@ import android.widget.ToggleButton;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.utility.DateUtilities;
+import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.ui.AstridTimePicker.TimePickerEnabledChangedListener;
 import com.todoroo.astrid.ui.CalendarView.OnSelectedDateListener;
@@ -64,7 +65,7 @@ public class DateAndTimePicker extends LinearLayout {
         super(context, attrs);
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
 
-        useShortcuts = false; //Preferences.getBoolean(R.string.p_use_date_shortcuts, true);
+        useShortcuts = Preferences.getBoolean(R.string.p_use_date_shortcuts, true);
         inflater.inflate(useShortcuts ? R.layout.date_time_picker : R.layout.date_time_picker_no_shortcuts, this, true);
 
 
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
index bd9faf7de..8fe029e92 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridDefaultPreferenceSpec.java
@@ -12,6 +12,8 @@ import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 
 public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
@@ -108,6 +110,9 @@ public class AstridDefaultPreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_calendar_reminders, true, ifUnset);
 
+        setPreference(prefs, editor, r, R.string.p_use_date_shortcuts,
+                ABChooser.readChoiceForTest(ABTests.AB_USE_DATE_SHORTCUTS) != 0, ifUnset);
+
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
         editor.commit();
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
index eedb633cf..f8acecf63 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridLitePreferenceSpec.java
@@ -12,6 +12,8 @@ import com.todoroo.astrid.activity.BeastModePreferences;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.service.abtesting.ABChooser;
+import com.todoroo.astrid.service.abtesting.ABTests;
 import com.todoroo.astrid.utility.AstridDefaultPreferenceSpec.PreferenceExtras;
 
 public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
@@ -123,6 +125,9 @@ public class AstridLitePreferenceSpec extends AstridPreferenceSpec {
 
         setPreference(prefs, editor, r, R.string.p_show_task_edit_comments, false, ifUnset);
 
+        setPreference(prefs, editor, r, R.string.p_use_date_shortcuts,
+                ABChooser.readChoiceForTest(ABTests.AB_USE_DATE_SHORTCUTS) != 0, ifUnset);
+
         extras.setExtras(context, prefs, editor, r, ifUnset);
 
         editor.commit();