Merge branch 'master' into introduce_cplus_database_version

Conflicts:
	gradle/wrapper/gradle-wrapper.properties
	src/main/res/values/strings.xml

1 files changed, 3 insertions, 0 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
index 4a330f30..1af538ec 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
@@ -469,6 +469,9 @@ public class MucOptions {
 	}
 
 	public Jid getTrueCounterpart(String name) {
+		if (name.equals(getSelf().getName())) {
+			return account.getJid().toBareJid();
+		}
 		User user = findUser(name);
 		return user == null ? null : user.getJid();
 	}