diff --git a/src/com/fsck/k9/Account.java b/src/com/fsck/k9/Account.java
index 86c557178..c66b48a58 100644
--- a/src/com/fsck/k9/Account.java
+++ b/src/com/fsck/k9/Account.java
@@ -579,7 +579,7 @@ public class Account implements BaseAccount
         editor.putString(mUuid + ".cryptoApp", mCryptoApp);
         editor.putBoolean(mUuid + ".cryptoAutoSignature", mCryptoAutoSignature);
 
-        editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.isVibrate());
+        editor.putBoolean(mUuid + ".vibrate", mNotificationSetting.shouldVibrate());
         editor.putInt(mUuid + ".vibratePattern", mNotificationSetting.getVibratePattern());
         editor.putInt(mUuid + ".vibrateTimes", mNotificationSetting.getVibrateTimes());
         editor.putBoolean(mUuid + ".ring", mNotificationSetting.shouldRing());
diff --git a/src/com/fsck/k9/NotificationSetting.java b/src/com/fsck/k9/NotificationSetting.java
index 737ae5ce2..6c5640e2a 100644
--- a/src/com/fsck/k9/NotificationSetting.java
+++ b/src/com/fsck/k9/NotificationSetting.java
@@ -82,7 +82,7 @@ public class NotificationSetting
         mLedColor = color;
     }
 
-    public synchronized boolean isVibrate()
+    public synchronized boolean shouldVibrate()
     {
         return mVibrate;
     }
diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java
index 44e36cf43..44a43af9f 100644
--- a/src/com/fsck/k9/activity/setup/AccountSettings.java
+++ b/src/com/fsck/k9/activity/setup/AccountSettings.java
@@ -533,7 +533,7 @@ public class AccountSettings extends K9PreferenceActivity
         prefs.edit().putString(PREFERENCE_RINGTONE, currentRingtone).commit();
 
         mAccountVibrate = (CheckBoxPreference) findPreference(PREFERENCE_VIBRATE);
-        mAccountVibrate.setChecked(mAccount.getNotificationSetting().isVibrate());
+        mAccountVibrate.setChecked(mAccount.getNotificationSetting().shouldVibrate());
 
         mAccountVibratePattern = (ListPreference) findPreference(PREFERENCE_VIBRATE_PATTERN);
         mAccountVibratePattern.setValue(String.valueOf(mAccount.getNotificationSetting().getVibratePattern()));
diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java
index 6e4702d24..e0d39ebb2 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/src/com/fsck/k9/controller/MessagingController.java
@@ -4739,7 +4739,7 @@ public class MessagingController implements Runnable
                 notification.sound = TextUtils.isEmpty(ringtone) ? null : Uri.parse(ringtone);
                 notification.audioStreamType = AudioManager.STREAM_NOTIFICATION;
             }
-            if (setting.isVibrate())
+            if (setting.shouldVibrate())
             {
                 long[] pattern = getVibratePattern(setting.getVibratePattern(), setting.getVibrateTimes());
                 notification.vibrate = pattern;