diff --git a/Signal/Signal-Info.plist b/Signal/Signal-Info.plist
index ac55ac17f..48369b3ef 100644
--- a/Signal/Signal-Info.plist
+++ b/Signal/Signal-Info.plist
@@ -38,7 +38,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2.0.10</string>
+	<string>2.0.11</string>
 	<key>LOGS_EMAIL</key>
 	<string>support@whispersystems.org</string>
 	<key>LOGS_URL</key>
diff --git a/Signal/src/contact/ContactsManager.m b/Signal/src/contact/ContactsManager.m
index 62547a905..6a6cc936d 100644
--- a/Signal/src/contact/ContactsManager.m
+++ b/Signal/src/contact/ContactsManager.m
@@ -381,8 +381,19 @@ void onAddressBookChanged(ABAddressBookRef notifyAddressBook, CFDictionaryRef in
 #pragma mark - Whisper User Management
 
 -(NSArray*) getSignalUsersFromContactsArray:(NSArray*)contacts {
-	return [contacts filter:^int(Contact* contact) {
+	return [[contacts filter:^int(Contact* contact) {
         return [self isContactRegisteredWithRedPhone:contact] || contact.isTextSecureContact;
+    }]sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
+        Contact *contact1 = (Contact*)obj1;
+        Contact *contact2 = (Contact*)obj2;
+        
+        BOOL firstNameOrdering = ABPersonGetSortOrdering() == kABPersonCompositeNameFormatFirstNameFirst?YES:NO;
+        
+        if (firstNameOrdering) {
+            return [contact1.firstName compare:contact2.firstName];
+        } else {
+            return [contact1.lastName compare:contact2.lastName];
+        }
     }];
 }
 
diff --git a/Signal/src/views/ContactTableViewCell.m b/Signal/src/views/ContactTableViewCell.m
index d0f406f4a..6007efb21 100644
--- a/Signal/src/views/ContactTableViewCell.m
+++ b/Signal/src/views/ContactTableViewCell.m
@@ -33,6 +33,9 @@
     _associatedContact = contact;
     
     _nameLabel.attributedText = [self attributedStringForContact:contact];
+    if (!contact.isTextSecureContact) {
+        _nameLabel.textColor = [UIColor grayColor];
+    }
 }
 
 - (NSAttributedString *)attributedStringForContact:(Contact *)contact {