diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_fragment.xml
similarity index 98%
rename from res/layout/message_view_header.xml
rename to res/layout/message_view_fragment.xml
index 1fcd4afde..284e709d4 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_fragment.xml
@@ -14,11 +14,6 @@
      limitations under the License.
 -->
 
-<!--
-    TODO Rename to message_view_fragment.xml
-    Can't do it now because git wouldn't detect renaming.
--->
-
 <ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/scrollview"
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 2a244159e..ff74677c6 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -286,7 +286,7 @@ public class MessageViewFragment extends Fragment implements View.OnClickListene
     @Override
     public View onCreateView(
             LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final View view = inflater.inflate(R.layout.message_view_header, container, false);
+        final View view = inflater.inflate(R.layout.message_view_fragment, container, false);
 
         mSubjectView = (TextView) view.findViewById(R.id.subject);
         mFromView = (TextView) view.findViewById(R.id.from);