Merge branch 'trz/rebase' into trz/rename

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
	src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
index 81c2eb4b..8d4b3c27 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
@@ -759,10 +759,16 @@ public class Conversation extends AbstractEntity implements Blockable {
 		synchronized (this.messages) {
 			int count = 0;
 			for(int i = this.messages.size() - 1; i >= 0; --i) {
-				if (this.messages.get(i).isRead()) {
+				Message message = this.messages.get(i);
+				if (message.isRead()) {
 					return count;
 				}
-				++count;
+				if (getMode() == Conversation.MODE_SINGLE
+						|| account.getXmppConnectionService().getNotificationService().conferenceNotificationsEnabled()
+						|| account.getXmppConnectionService().getNotificationService().wasHighlightedOrPrivate(message)
+						) {
+					++count;
+				}
 			}
 			return count;
 		}