diff --git a/res/values/keys.xml b/res/values/keys.xml
index aaec5b391..d20f23ea8 100644
--- a/res/values/keys.xml
+++ b/res/values/keys.xml
@@ -34,6 +34,8 @@
         <string name="p_notif_defaultRemind">notif_default_reminder</string>
     
         <string name="p_notif_annoy">notif_annoy</string>
+
+        <string name="p_notif_vibrate">notif_vibrate</string>
        
         <string name="p_notification_ringtone">notification_ringtone</string>
        
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ba2eaac9..0e9e1bb40 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -416,6 +416,9 @@ Thanks for using Astrid!\n
         <string name="prefs_notificon_title">Notification Icons</string>
         <string name="prefs_notificon_desc">Choose Astrid\'s notification bar icon</string>
         
+        <string name="prefs_vibrate_title">Vibrate on Alert</string>
+        <string name="prefs_vibrate_desc">If checked, Astrid will vibrate when sounding an alarm</string>
+        
         <string name="prefs_category_appearance">Appearance</string>
             
         <string name="prefs_colorize_title">Colorize Task List</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2a88cf336..f640ed123 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -16,6 +16,10 @@
             android:key="@string/p_notif_annoy"  
             android:title="@string/prefs_annoy_title"  
             android:summary="@string/prefs_annoy_desc" />  
+        <CheckBoxPreference  
+            android:key="@string/p_notif_vibrate"  
+            android:title="@string/prefs_vibrate_title"  
+            android:summary="@string/prefs_vibrate_desc" />  
         <EditTextPreference  
             android:key="@string/p_notif_defaultRemind"  
             android:title="@string/prefs_defaultRemind_title"  
diff --git a/src/com/timsu/astrid/utilities/Notifications.java b/src/com/timsu/astrid/utilities/Notifications.java
index 05cc85c33..1ca3b5f17 100644
--- a/src/com/timsu/astrid/utilities/Notifications.java
+++ b/src/com/timsu/astrid/utilities/Notifications.java
@@ -460,11 +460,13 @@ public class Notifications extends BroadcastReceiver {
             notification.vibrate = null;
             notification.sound = null;
         } else {
-            if(audioManager.getVibrateSetting(AudioManager.STREAM_RING) !=
-                    AudioManager.VIBRATE_SETTING_OFF)
-                notification.defaults |= Notification.DEFAULT_VIBRATE;
-            else
+            if (Preferences.shouldVibrate(context)
+                && audioManager.getVibrateSetting(AudioManager.STREAM_RING) !=
+                    AudioManager.VIBRATE_SETTING_OFF) {
+                notification.vibrate = new long[] { 2000, 2000, 2000, 2000 };
+            } else {
                 notification.vibrate = null;
+            }
 
             Uri notificationSound = Preferences.getNotificationRingtone(context);
             if(audioManager.getStreamVolume(AudioManager.STREAM_RING) == 0) {
diff --git a/src/com/timsu/astrid/utilities/Preferences.java b/src/com/timsu/astrid/utilities/Preferences.java
index c5481f72f..2ffeeca89 100644
--- a/src/com/timsu/astrid/utilities/Preferences.java
+++ b/src/com/timsu/astrid/utilities/Preferences.java
@@ -56,6 +56,9 @@ public class Preferences {
         if(!prefs.contains(r.getString(R.string.p_colorize))) {
             editor.putBoolean(r.getString(R.string.p_colorize), DEFAULT_COLORIZE);
         }
+        if(!prefs.contains(r.getString(R.string.p_notif_vibrate))) {
+            editor.putBoolean(r.getString(R.string.p_notif_vibrate), true);
+        }
 
         setVisibilityPreferences(prefs, editor, r);
 
@@ -199,6 +202,13 @@ public class Preferences {
                 R.string.p_notif_annoy), DEFAULT_PERSISTENCE_MODE);
     }
 
+    /** Get vibration mode setting */
+    public static boolean shouldVibrate(Context context) {
+        Resources r = context.getResources();
+        return getPrefs(context).getBoolean(r.getString(
+                R.string.p_notif_vibrate), true);
+    }
+
     /** Return # of days to remind by default */
     public static Integer getDefaultReminder(Context context) {
         return getIntegerValue(context, R.string.p_notif_defaultRemind);