From 6536c1aeb143ffaf4250c146c574ab25e1e178c2 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Thu, 7 Aug 2014 11:02:41 +0200
Subject: [PATCH] bug fix for not working notification grace period in muc

---
 src/eu/siacs/conversations/utils/UIHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 5d959b17..81b356f7 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -334,7 +334,7 @@ public class UIHelper {
 		boolean vibrate = preferences.getBoolean("vibrate_on_notification",
 				true);
 		boolean alwaysNotify = preferences.getBoolean(
-				"notify_in_conversation_when_highlighted", false);
+				"notify_in_conversation_when_highlighted", false) && notify;
 
 		if (!showNofifications) {
 			mNotificationManager.cancel(2342);