diff --git a/res/layout/call_details_voicemail_header.xml b/res/layout/call_details_voicemail_header.xml
index 7f8b9b8..e3640fa 100644
--- a/res/layout/call_details_voicemail_header.xml
+++ b/res/layout/call_details_voicemail_header.xml
@@ -18,15 +18,6 @@
     android:layout_height="wrap_content"
     android:orientation="vertical" >
 
-        <TextView
-            android:id="@+id/voicemail_transcription"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="@dimen/call_detail_horizontal_margin"
-            android:paddingEnd="@dimen/call_detail_horizontal_margin"
-            android:paddingTop="@dimen/transcription_top_margin"
-            android:paddingBottom="@dimen/transcription_bottom_margin" />
-
         <LinearLayout
             android:id="@+id/voicemail_container"
             android:layout_width="match_parent"
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 401c2ae..2401c47 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -121,8 +121,7 @@
     /* package */ Resources mResources;
     /** Helper to load contact photos. */
     private ContactPhotoManager mContactPhotoManager;
-    // Views related to voicemail status message.
-    private TextView mVoicemailTranscription;
+
     private LinearLayout mVoicemailHeader;
 
     private Uri mVoicemailUri;
@@ -216,8 +215,6 @@
             mVoicemailHeader =
                     (LinearLayout) inflater.inflate(R.layout.call_details_voicemail_header, null);
             View voicemailContainer = mVoicemailHeader.findViewById(R.id.voicemail_container);
-            mVoicemailTranscription = (
-                    TextView) mVoicemailHeader.findViewById(R.id.voicemail_transcription);
             ListView historyList = (ListView) findViewById(R.id.history);
             historyList.addHeaderView(mVoicemailHeader);
             // Has voicemail: add the voicemail fragment.  Add suitable arguments to set the uri
@@ -408,11 +405,6 @@
                     nameForDefaultImage = firstDetails.name.toString();
                 }
 
-                if (hasVoicemail() && !TextUtils.isEmpty(firstDetails.transcription)) {
-                    mVoicemailTranscription.setText(firstDetails.transcription);
-                    mVoicemailTranscription.setVisibility(View.VISIBLE);
-                }
-
                 loadContactPhotos(
                         contactUri, photoUri, nameForDefaultImage, lookupKey, contactType);
                 findViewById(R.id.call_detail).setVisibility(View.VISIBLE);
