From de2964cd2555e59ba60373e34765250f8aae35a6 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 9 Aug 2014 09:37:37 +0200
Subject: [PATCH] more fixes for notfication in conferences

---
 src/eu/siacs/conversations/utils/UIHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 81b356f79..46a911547 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;
+				"notify_in_conversation_when_highlighted", false);
 
 		if (!showNofifications) {
 			mNotificationManager.cancel(2342);
@@ -345,7 +345,7 @@ public class UIHelper {
 
 		if ((currentCon != null)
 				&& (currentCon.getMode() == Conversation.MODE_MULTI)
-				&& (!alwaysNotify)) {
+				&& (!alwaysNotify) && notify) {
 			String nick = currentCon.getMucOptions().getActualNick();
 			Pattern highlight = generateNickHighlightPattern(nick);
 			Matcher m = highlight.matcher(currentCon.getLatestMessage()