diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 5ed0acd..68adf0f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -490,8 +490,9 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.contacts.common.dialog.CallSubjectHistory"
-                  android:theme="@style/Theme.CallSubjectSelector">
+        <activity android:name="com.android.contacts.common.dialog.CallSubjectDialog"
+                  android:theme="@style/Theme.CallSubjectDialogTheme"
+                  android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW"/>
             </intent-filter>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f802f91..7f7f571 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -189,7 +189,7 @@
     <string name="date_year_toggle" msgid="7122002148518724139">"Incluir año"</string>
     <string name="social_widget_label" msgid="6378905543028924592">"Contacto"</string>
     <string name="social_widget_loading" msgid="5327336597364074608">"Cargando..."</string>
-    <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Crear nuevo contacto"</string>
+    <string name="contacts_unavailable_create_contact" msgid="7014525713871959208">"Crear un contacto"</string>
     <string name="contacts_unavailable_add_account" msgid="7911101713860139754">"Iniciar sesión en una cuenta"</string>
     <string name="contacts_unavailable_import_contacts" msgid="4957393255392437529">"Importar contactos"</string>
     <string name="create_group_dialog_title" msgid="6874527142828424475">"Crear nuevo grupo"</string>
diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index 1591866..97c6ea0 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -1246,7 +1246,7 @@
             final Uri contactUri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
             final Uri lookupUri = Contacts.getLookupUri(getContentResolver(), contactUri);
             List<String> pathSegments = lookupUri.getPathSegments();
-            uriListBuilder.append(pathSegments.get(pathSegments.size() - 2));
+            uriListBuilder.append(Uri.encode(pathSegments.get(pathSegments.size() - 2)));
             firstIteration = false;
         }
         final Uri uri = Uri.withAppendedPath(