Index: /applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java
===================================================================
--- /applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java	(revision 29589)
+++ /applications/editors/josm/plugins/geochat/src/geochat/ChatPaneManager.java	(revision 29590)
@@ -135,9 +135,8 @@
         chatPane.setEditable(false);
         Font font = chatPane.getFont();
-        float sizeParameter = Main.pref.getInteger("geochat.panel.fontsize", -1); 
-        float size = sizeParameter;
-        if ( sizeParameter <= 0 ) size += font.getSize2D();
-        chatPane.setFont(font.deriveFont( size ));
-
+        float size = Main.pref.getInteger("geochat.fontsize", -1);
+        if( size < 6 )
+            size += font.getSize2D();
+        chatPane.setFont(font.deriveFont(size));
 //        DefaultCaret caret = (DefaultCaret)chatPane.getCaret(); // does not work
 //        caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
Index: /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java
===================================================================
--- /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 29589)
+++ /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 29590)
@@ -56,10 +56,4 @@
             }
         };
-        
-        Font font = input.getFont();
-        float sizeParameter = Main.pref.getInteger("geochat.input.fontsize", 0); 
-        float size = sizeParameter;
-        if ( sizeParameter <= 0 ) size += font.getSize2D();
-        input.setFont(font.deriveFont( size ));
         
         String defaultUserName = constructUserName();