diff --git a/src/eu/siacs/conversations/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java
index a0047cdf3..50d7af8b0 100644
--- a/src/eu/siacs/conversations/entities/Contact.java
+++ b/src/eu/siacs/conversations/entities/Contact.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.entities;
 
 import java.util.HashSet;
+import java.util.Locale;
 import java.util.Set;
 
 import org.json.JSONArray;
@@ -78,7 +79,7 @@ public class Contact {
 	}
 
 	public String getJid() {
-		return this.jid;
+		return this.jid.toLowerCase(Locale.getDefault());
 	}
 
 	public boolean match(String needle) {
diff --git a/src/eu/siacs/conversations/entities/Roster.java b/src/eu/siacs/conversations/entities/Roster.java
index c1e40dbcc..aa3286641 100644
--- a/src/eu/siacs/conversations/entities/Roster.java
+++ b/src/eu/siacs/conversations/entities/Roster.java
@@ -2,6 +2,7 @@ package eu.siacs.conversations.entities;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class Roster {
@@ -19,7 +20,7 @@ public class Roster {
 	}
 	
 	public Contact getContact(String jid) {
-		String cleanJid = jid.split("/")[0];
+		String cleanJid = jid.split("/")[0].toLowerCase(Locale.getDefault());
 		if (contacts.containsKey(cleanJid)) {
 			return contacts.get(cleanJid);
 		} else {