diff --git a/src/com/android/contacts/activities/ContactDetailActivity.java b/src/com/android/contacts/activities/ContactDetailActivity.java
index 856899e..5894f77 100644
--- a/src/com/android/contacts/activities/ContactDetailActivity.java
+++ b/src/com/android/contacts/activities/ContactDetailActivity.java
@@ -27,7 +27,6 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
-import android.view.Menu;
 import android.view.MenuItem;
 
 public class ContactDetailActivity extends Activity {
@@ -49,30 +48,6 @@
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // TODO: This is too hardwired.
-        if (mFragment.onCreateOptionsMenu(menu, getMenuInflater())) return true;
-
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO: This is too hardwired.
-        if (mFragment.onPrepareOptionsMenu(menu)) return true;
-
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // TODO: This is too hardwired.
-        if (mFragment.onOptionsItemSelected(item)) return true;
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
     protected Dialog onCreateDialog(int id, Bundle args) {
         // ask the Fragment whether it knows about the dialog
         final Dialog fragmentResult = mFragment.onCreateDialog(id, args);
diff --git a/src/com/android/contacts/activities/ContactEditorActivity.java b/src/com/android/contacts/activities/ContactEditorActivity.java
index 377648a..e325eba 100644
--- a/src/com/android/contacts/activities/ContactEditorActivity.java
+++ b/src/com/android/contacts/activities/ContactEditorActivity.java
@@ -47,30 +47,6 @@
     }
 
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // TODO: This is too hardwired.
-        if (mFragment.onCreateOptionsMenu(menu, getMenuInflater())) return true;
-
-        return super.onCreateOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        // TODO: This is too hardwired.
-        if (mFragment.onPrepareOptionsMenu(menu)) return true;
-
-        return super.onPrepareOptionsMenu(menu);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // TODO: This is too hardwired.
-        if (mFragment.onOptionsItemSelected(item)) return true;
-
-        return super.onOptionsItemSelected(item);
-    }
-
-    @Override
     protected Dialog onCreateDialog(int id, Bundle args) {
         // ask the Fragment whether it knows about the dialog
         final Dialog fragmentResult = mFragment.onCreateDialog(id, args);
diff --git a/src/com/android/contacts/views/detail/ContactDetailFragment.java b/src/com/android/contacts/views/detail/ContactDetailFragment.java
index 0a967bd..f005efa 100644
--- a/src/com/android/contacts/views/detail/ContactDetailFragment.java
+++ b/src/com/android/contacts/views/detail/ContactDetailFragment.java
@@ -165,6 +165,8 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
         final View view = inflater.inflate(R.layout.contact_detail_fragment, container, false);
 
+        setHasOptionsMenu(true);
+        
         mInflater = inflater;
 
         mHeaderView = (ContactDetailHeaderView) view.findViewById(R.id.contact_header_widget);
@@ -798,20 +800,17 @@
         }
     }
 
-    public boolean onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
+    public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.view, menu);
-        return true;
     }
 
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public void onPrepareOptionsMenu(Menu menu) {
         // Only allow edit when we have at least one raw_contact id
         final boolean hasRawContact = (mRawContactIds.size() > 0);
         menu.findItem(R.id.menu_edit).setEnabled(hasRawContact);
 
         // Only allow share when unrestricted contacts available
         menu.findItem(R.id.menu_share).setEnabled(!mAllRestricted);
-
-        return true;
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/src/com/android/contacts/views/editor/ContactEditorFragment.java b/src/com/android/contacts/views/editor/ContactEditorFragment.java
index 8626939..493a351 100644
--- a/src/com/android/contacts/views/editor/ContactEditorFragment.java
+++ b/src/com/android/contacts/views/editor/ContactEditorFragment.java
@@ -129,6 +129,8 @@
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
         final View view = inflater.inflate(R.layout.contact_editor_fragment, container, false);
 
+        setHasOptionsMenu(true);
+        
         mInflater = inflater;
 
         mHeaderView =
@@ -700,14 +702,12 @@
         }
     }
 
-    public boolean onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
+    public void onCreateOptionsMenu(Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.view, menu);
-        return true;
     }
 
-    public boolean onPrepareOptionsMenu(Menu menu) {
+    public void onPrepareOptionsMenu(Menu menu) {
         // TODO: Prepare options
-        return true;
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {