diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index cf2b18e..35b00a0 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -618,9 +618,6 @@
             // Set direction of the name field
             int nameDirection = View.TEXT_DIRECTION_INHERIT;
             if (nameIsNumber) {
-                if (PhoneNumberUtils.isEmergencyNumber(name)) {
-                    mPrimaryName.setSingleLine(false);
-                }
                 nameDirection = View.TEXT_DIRECTION_LTR;
             }
             mPrimaryName.setTextDirection(nameDirection);
diff --git a/InCallUI/src/com/android/incallui/CallerInfo.java b/InCallUI/src/com/android/incallui/CallerInfo.java
index db1b864..ccee604 100644
--- a/InCallUI/src/com/android/incallui/CallerInfo.java
+++ b/InCallUI/src/com/android/incallui/CallerInfo.java
@@ -404,9 +404,8 @@
 
     /* package */ CallerInfo markAsEmergency(Context context, String number) {
         number = PhoneNumberUtils.normalizeNumber(number);
-        name = context.getString(R.string.emergency_call_dialog_number_for_display) + " "
-                + number;
-        phoneNumber = null;
+        name = context.getString(R.string.emergency_call_dialog_number_for_display);
+        phoneNumber = number;
 
         photoResource = R.drawable.img_phone;
         mIsEmergency = true;
