diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index d738023..b4fc096 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -894,9 +894,8 @@
 
         @Override
         public void onViewContactAction(Uri contactLookupUri) {
-            Intent intent = QuickContact.composeQuickContactsIntent(PeopleActivity.this,
-                    (Rect) null, contactLookupUri, QuickContactActivity.MODE_FULLY_EXPANDED, null);
-            startActivity(intent);
+            QuickContact.showQuickContact(PeopleActivity.this, (Rect) null, contactLookupUri,
+                    QuickContactActivity.MODE_FULLY_EXPANDED, null);
         }
 
         @Override
@@ -958,9 +957,8 @@
 
         @Override
         public void onContactSelected(Uri contactUri, Rect targetRect) {
-            Intent intent = QuickContact.composeQuickContactsIntent(PeopleActivity.this,
-                    targetRect, contactUri, QuickContactActivity.MODE_FULLY_EXPANDED, null);
-            startActivity(intent);
+            QuickContact.showQuickContact(PeopleActivity.this, targetRect, contactUri,
+                    QuickContactActivity.MODE_FULLY_EXPANDED, null);
         }
 
         @Override
diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
index 240a42f..3eadaed 100644
--- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java
+++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java
@@ -127,11 +127,11 @@
      * successful saving a contact.
      */
     protected static Intent composeQuickContactsIntent(Context context, Uri contactLookupUri) {
-        final Intent intent = QuickContact.composeQuickContactsIntent(
-                context, (Rect) null, contactLookupUri, QuickContactActivity.MODE_FULLY_EXPANDED,
-                /* excludedMimes =*/ null);
+        final Intent intent = new Intent(QuickContact.ACTION_QUICK_CONTACT);
+        intent.setData(contactLookupUri);
+        intent.putExtra(QuickContact.EXTRA_MODE, QuickContactActivity.MODE_FULLY_EXPANDED);
         // Make sure not to show QuickContacts on top of another QuickContacts.
-        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
         return intent;
     }
 }
