1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index a0d298d47..bb7162bb3 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -4172,9 +4172,12 @@ public class XmppConnectionService extends Service {
     }
 
     public void vibrate() {
-        Log.d(Config.LOGTAG, "Notification: short vibrate");
-        Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
-        vibrator.vibrate(100);
+        final boolean vibrateInChat = getBooleanPreference("vibrate_in_chat", R.bool.vibrate_in_chat);
+        if (!isPhoneSilenced() && vibrateInChat) {
+            Log.d(Config.LOGTAG, "Notification: short vibrate");
+            Vibrator vibrator = (Vibrator) getSystemService(VIBRATOR_SERVICE);
+            vibrator.vibrate(100);
+        }
     }
 
     private <T> List<T> threadSafeList(Set<T> set) {