diff --git a/res/values/arrays.xml b/res/values/arrays.xml
new file mode 100644
index 0000000..97b1886
--- /dev/null
+++ b/res/values/arrays.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="fontsize_labels">
+        <item>8px</item>
+        <item>9px</item>
+        <item>10px</item>
+        <item>11px</item>
+        <item>12px</item>
+        <item>13px</item>
+        <item>14px</item>
+        <item>15px</item>
+        <item>16px</item>
+    </string-array>
+    <string-array name="fontsize_values">
+        <item>8</item>
+        <item>9</item>
+        <item>10</item>
+        <item>11</item>
+        <item>12</item>
+        <item>13</item>
+        <item>14</item>
+        <item>15</item>
+        <item>16</item>
+    </string-array>
+</resources>
diff --git a/res/values/settings.xml b/res/values/settings.xml
index 68ec33e..6cf9bf2 100644
--- a/res/values/settings.xml
+++ b/res/values/settings.xml
@@ -17,4 +17,7 @@
 	
 	<string name="key_quitmessage">quitmessage</string>
 	<string name="default_quitmessage">Yaaic - Yet another Android IRC client - http://www.yaaic.org</string>
+	
+	<string name="key_fontsize">fontsize</string>
+	<string name="default_fontsize">11</string>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb53e1f..4153764 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -166,4 +166,8 @@
     <string name="settings_quitmessage_desc">Message to show when you disconnect</string>
     <string name="settings_quitmessage_dialog_title">Quit message</string>
     <string name="settings_quitmessage_dialog_desc">Message to show when you disconnect:</string>
+    <string name="settings_fontsize_title">Font size</string>
+    <string name="settings_fontsize_desc">Set the global font size</string>
+    <string name="settings_fontsize_dialog_title">Font size</string>
+    <string name="settings_fontsize_dialog_desc">Choose a font size</string>
 </resources>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index d163c34..8bd502c 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -31,6 +31,14 @@ along with Yaaic.  If not, see <http://www.gnu.org/licenses/>.
 	</PreferenceCategory>
 	<PreferenceCategory
 		android:title="@string/settings_chat">
+		<ListPreference
+            android:title="@string/settings_fontsize_title"
+            android:summary="@string/settings_fontsize_desc"
+            android:dialogTitle="@string/settings_fontsize_dialog_title"
+            android:entries="@array/fontsize_labels"
+            android:entryValues="@array/fontsize_values"
+            android:key="@string/key_fontsize"
+            android:defaultValue="@string/default_fontsize" />
 		<CheckBoxPreference
 			android:title="@string/settings_icons_title"
 			android:summary="@string/settings_icons_desc"
diff --git a/src/org/yaaic/model/Message.java b/src/org/yaaic/model/Message.java
index 613fdf7..8258816 100644
--- a/src/org/yaaic/model/Message.java
+++ b/src/org/yaaic/model/Message.java
@@ -132,10 +132,13 @@ public class Message {
 	 */
 	public TextView renderTextView(Context context)
 	{
+		// XXX: We should not read settings here ALWAYS for EVERY textview
+		Settings settings = new Settings(context);
+		
 		TextView canvas = new TextView(context);
 		
 		canvas.setText(this.render(context));
-		canvas.setTextSize(11);
+		canvas.setTextSize(settings.getFontSize());
 		canvas.setTypeface(Typeface.MONOSPACE);
 		canvas.setTextColor(0xffeeeeee);
 		
diff --git a/src/org/yaaic/model/Settings.java b/src/org/yaaic/model/Settings.java
index 159847a..274b9d0 100644
--- a/src/org/yaaic/model/Settings.java
+++ b/src/org/yaaic/model/Settings.java
@@ -74,7 +74,6 @@ public class Settings
 	public boolean showIcons()
 	{
 		return preferences.getBoolean(
-				
 			resources.getString(R.string.key_show_icons),
 			Boolean.parseBoolean(resources.getString(R.string.default_show_icons))
 		);
@@ -131,4 +130,17 @@ public class Settings
 			resources.getString(R.string.default_quitmessage)
 		);
 	}
+	
+	/**
+	 * Get the font size
+	 * 
+	 * @return The font size for conversation messages
+	 */
+	public int getFontSize()
+	{
+		return Integer.parseInt(preferences.getString(
+			resources.getString(R.string.key_fontsize),
+			resources.getString(R.string.default_fontsize)
+		));
+	}
 }