Merge trz/rename into trz/rebase

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index 6ff0e270..1f3d35e7 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -20,6 +20,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import eu.siacs.conversations.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
 import eu.siacs.conversations.xmpp.jid.InvalidJidException;
 import eu.siacs.conversations.xmpp.jid.Jid;
@@ -764,7 +765,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 					return count;
 				}
 				if (getMode() == Conversation.MODE_SINGLE
-						|| account.getXmppConnectionService().getNotificationService().conferenceNotificationsEnabled()
+						|| ConversationsPlusPreferences.alwaysNotifyInConference()
 						|| account.getXmppConnectionService().getNotificationService().wasHighlightedOrPrivate(message)
 						) {
 					++count;