diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 9899424..31dcd88 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -81,6 +81,7 @@
                     android:id="@+id/name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
                     android:layout_marginEnd="@dimen/call_log_icon_margin"
                     android:textColor="?attr/call_log_primary_text_color"
                     android:textSize="@dimen/call_log_primary_text_size"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index dc285cf..1269a81 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -33,6 +33,7 @@
     <dimen name="call_log_outer_margin">8dp</dimen>
     <dimen name="call_log_start_margin">16dp</dimen>
     <dimen name="call_log_indent_margin">24dip</dimen>
+    <dimen name="call_log_name_margin_bottom">2dp</dimen>
     <dimen name="call_log_list_item_height">56dip</dimen>
     <dimen name="call_log_list_contact_photo_size">40dip</dimen>
     <dimen name="call_detail_contact_name_margin">24dip</dimen>
diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java
index 4752620..924a17f 100644
--- a/src/com/android/dialer/calllog/CallLogAdapter.java
+++ b/src/com/android/dialer/calllog/CallLogAdapter.java
@@ -578,7 +578,15 @@
     protected View newChildView(Context context, ViewGroup parent) {
         LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         View view = inflater.inflate(R.layout.call_log_list_item, parent, false);
-        findAndCacheViews(view);
+
+        // Get the views to bind to and cache them.
+        CallLogListItemViews views = CallLogListItemViews.fromView(view);
+        view.setTag(views);
+
+        // Set text height to false on the TextViews so they don't have extra padding.
+        views.phoneCallDetailsViews.nameView.setElegantTextHeight(false);
+        views.phoneCallDetailsViews.callLocationAndDate.setElegantTextHeight(false);
+
         return view;
     }
 
@@ -599,9 +607,6 @@
     }
 
     private void findAndCacheViews(View view) {
-        // Get the views to bind to.
-        CallLogListItemViews views = CallLogListItemViews.fromView(view);
-        view.setTag(views);
     }
 
     /**
