diff --git a/res/layout/row_message.xml b/res/layout/row_message.xml
index a14ac38e2..6e29d471a 100644
--- a/res/layout/row_message.xml
+++ b/res/layout/row_message.xml
@@ -18,7 +18,6 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="24dp"
     android:orientation="horizontal">
 
     <TextView
@@ -49,7 +48,7 @@
         android:linksClickable="true"
         android:lineSpacingExtra="4dp"
         android:paddingRight="8dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginBottom="@dimen/message_row_spacing"
         android:layout_weight="1" />
 
     <ImageView
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index ad7d2db86..272946c91 100644
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -16,4 +16,6 @@
 
 <resources>
     <dimen name="drawer_width">200dp</dimen>
+    <integer name="default_text_size">16</integer>
+    <dimen name="message_row_spacing">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 13688d58e..a97301bab 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -19,4 +19,6 @@
     <dimen name="unread_top_txt_size">16sp</dimen>
     <dimen name="unread_bottom_txt_size">16sp</dimen>
     <dimen name="unread_bubble_size">28dp</dimen>
+    <integer name="default_text_size">16</integer>
+    <dimen name="message_row_spacing">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values-sw800dp/dimens.xml b/res/values-sw800dp/dimens.xml
index c34f50590..b3b1bf5cd 100644
--- a/res/values-sw800dp/dimens.xml
+++ b/res/values-sw800dp/dimens.xml
@@ -18,4 +18,6 @@
     <dimen name="unread_top_txt_size">16sp</dimen>
     <dimen name="unread_bottom_txt_size">16sp</dimen>
     <dimen name="unread_bubble_size">28dp</dimen>
+    <integer name="default_text_size">16</integer>
+    <dimen name="message_row_spacing">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a1170f78a..0adbf0834 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -27,4 +27,6 @@
     <dimen name="status_bar_height">25dp</dimen>
     <dimen name="scrollbar_inset">0dp</dimen>
     <dimen name="scrollbar_size">2dp</dimen>
+    <integer name="default_text_size">14</integer>
+    <dimen name="message_row_spacing">0dp</dimen>
 </resources>
diff --git a/res/xml-v14/preferences_display.xml b/res/xml-v14/preferences_display.xml
index a2423d1c3..2eab5c927 100644
--- a/res/xml-v14/preferences_display.xml
+++ b/res/xml-v14/preferences_display.xml
@@ -43,7 +43,7 @@
         <com.robobunny.SeekBarPreference
             android:key="textSize"
             android:title="Text Size"
-            android:defaultValue="16"
+            android:defaultValue="@integer/default_text_size"
             android:max="24"
             robobunny:min="12"
             robobunny:unitsLeft=""
diff --git a/res/xml/preferences_display.xml b/res/xml/preferences_display.xml
index 9eef92278..e14878b4c 100644
--- a/res/xml/preferences_display.xml
+++ b/res/xml/preferences_display.xml
@@ -39,7 +39,7 @@
         <com.robobunny.SeekBarPreference
             android:key="textSize"
             android:title="Text Size"
-            android:defaultValue="16"
+            android:defaultValue="@integer/default_text_size"
             android:max="24"
             robobunny:min="12"
             robobunny:unitsLeft=""
diff --git a/src/com/irccloud/android/fragment/MessageViewFragment.java b/src/com/irccloud/android/fragment/MessageViewFragment.java
index abde2b6e2..4af6d8a19 100644
--- a/src/com/irccloud/android/fragment/MessageViewFragment.java
+++ b/src/com/irccloud/android/fragment/MessageViewFragment.java
@@ -1582,7 +1582,7 @@ public void run() {
 	private synchronized void refresh(MessageAdapter adapter, TreeMap<Long,EventsDataSource.Event> events) {
         synchronized (adapterLock) {
             if(getActivity() != null)
-                textSize = PreferenceManager.getDefaultSharedPreferences(getActivity()).getInt("textSize", 16);
+                textSize = PreferenceManager.getDefaultSharedPreferences(getActivity()).getInt("textSize", getActivity().getResources().getInteger(R.integer.default_text_size));
             timestamp_width = -1;
             if(conn.getReconnectTimestamp() == 0)
                 conn.cancel_idle_timer(); //This may take a while...