diff --git a/src/com/android/messaging/util/AvatarUriUtil.java b/src/com/android/messaging/util/AvatarUriUtil.java
index b6c65e3..ff516ac 100644
--- a/src/com/android/messaging/util/AvatarUriUtil.java
+++ b/src/com/android/messaging/util/AvatarUriUtil.java
@@ -161,7 +161,8 @@ public class AvatarUriUtil {
     public static Uri createAvatarUri(final Uri profilePhotoUri, final CharSequence name,
             final String defaultIdentifier, final String contactLookupKey) {
         Uri generatedUri;
-        if (!TextUtils.isEmpty(name) && isValidFirstCharacter(name)) {
+        if (name != null && !TextUtils.isEmpty(name)
+                && Character.isLetter(name.charAt(0))) {
             generatedUri = AvatarUriUtil.fromName(name, contactLookupKey);
         } else {
             final String identifier = TextUtils.isEmpty(contactLookupKey)
@@ -180,11 +181,6 @@ public class AvatarUriUtil {
         }
     }
 
-    public static boolean isValidFirstCharacter(final CharSequence name) {
-        final char c = name.charAt(0);
-        return c != '+';
-    }
-
     /**
      * Creates an avatar URI used for the SIM selector.
      * @param participantData the self participant data for an <i>active</i> SIM