Merge branch 'development'

2 files changed, 6 insertions, 2 deletions

diff --git a/src/eu/siacs/conversations/ui/ContactsActivity.java b/src/eu/siacs/conversations/ui/ContactsActivity.java
index 811ae876..fee3de7a 100644
--- a/src/eu/siacs/conversations/ui/ContactsActivity.java
+++ b/src/eu/siacs/conversations/ui/ContactsActivity.java
@@ -485,8 +485,11 @@ public class ContactsActivity extends XmppActivity {
 	}
 	
 	private boolean isMuc(Contact contact) {
-		String server = contact.getJid().split("@")[1];
-		return getMucServers().contains(server);
+		String[] parts = contact.getJid().split("@");
+		if (parts.length != 2) {
+			return false;
+		}
+		return getMucServers().contains(parts[1]);
 	}
 
 	public void startConversation(Contact contact, Account account, boolean muc) {
diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 15bb8969..529d2b4c 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -129,6 +129,7 @@ public class UIHelper {
 			int textColor, int left, int top, int right, int bottom) {
 		Paint tilePaint = new Paint(), textPaint = new Paint();
 		tilePaint.setColor(tileColor);
+		textPaint.setFlags(Paint.ANTI_ALIAS_FLAG);
 		textPaint.setColor(textColor);
 		textPaint.setTypeface(Typeface.create("sans-serif-light",
 				Typeface.NORMAL));