Index: /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java
===================================================================
--- /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 29562)
+++ /applications/editors/josm/plugins/geochat/src/geochat/GeoChatPanel.java	(revision 29563)
@@ -48,14 +48,5 @@
         createChatPane(null);
 
-        tabs.addMouseListener(new MouseAdapter() {
-            @Override public void mousePressed( MouseEvent e ) { check(e); }
-            @Override public void mouseReleased( MouseEvent e ) { check(e); }
-
-            private void check( MouseEvent e ) {
-                if( e.isPopupTrigger() ) {
-                    createPopupMenu().show(tabs, e.getX(), e.getY());
-                }
-            }
-        });
+        tabs.addMouseListener(new PopupAdapter());
 
         input = new JPanelTextField() {
@@ -92,7 +83,4 @@
         nameField.setPreferredSize(new Dimension(nameField.getPreferredSize().width, loginButton.getPreferredSize().height));
 
-//        loginPanel = new JPanel(new BorderLayout());
-//        loginPanel.add(nameField, BorderLayout.CENTER);
-//        loginPanel.add(loginButton, BorderLayout.EAST);
         loginPanel = new JPanel(new GridBagLayout());
         loginPanel.add(nameField, GBC.std().fill(GridBagConstraints.HORIZONTAL).insets(15, 0, 5, 0));
@@ -108,22 +96,4 @@
         connection.addListener(this);
         connection.checkLogin();
-    }
-    
-    private JPopupMenu createPopupMenu() {
-        JMenu userMenu = new JMenu(tr("Private chat"));
-        for( String user : users.keySet() ) {
-            if( !chatPanes.containsKey(user) )
-                userMenu.add(new PrivateChatAction(user));
-        }
-
-        JPopupMenu menu = new JPopupMenu();
-        menu.add(new JCheckBoxMenuItem(new ToggleUserLayerAction()));
-        if( userMenu.getComponentCount() > 0 )
-            menu.add(userMenu);
-        if( getRecipient() != null )
-            menu.add(new CloseTabAction());
-        menu.add(new ClearPaneAction());
-        menu.add(new LogoutAction());
-        return menu;
     }
 
@@ -165,4 +135,5 @@
         caret.setUpdatePolicy(DefaultCaret.ALWAYS_UPDATE);
         JScrollPane scrollPane = new JScrollPane(chatPane, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+        chatPane.addMouseListener(new PopupAdapter());
 
         ChatLogEntry entry = new ChatLogEntry();
@@ -243,5 +214,5 @@
             radius /= 2;
 
-        Font font = g2d.getFont().deriveFont(Math.min(zoom * 2, 8));
+        Font font = g2d.getFont().deriveFont(Font.BOLD, Math.max(zoom * 2, 8));
         g2d.setFont(font);
         FontMetrics fm = g2d.getFontMetrics();
@@ -257,4 +228,6 @@
         }
     }
+
+    /* ============ ChatServerConnectionListener methods ============= */
 
     public void loggedIn( String userName ) {
@@ -350,4 +323,6 @@
         }
     }
+
+    /* =================== Service classes ==================== */
 
     private class JPanelTextField extends JTextField {
@@ -389,4 +364,36 @@
     }
 
+    /* ================= Actions for popup menu ==================== */
+
+
+    private JPopupMenu createPopupMenu() {
+        JMenu userMenu = new JMenu(tr("Private chat"));
+        for( String user : users.keySet() ) {
+            if( !chatPanes.containsKey(user) )
+                userMenu.add(new PrivateChatAction(user));
+        }
+
+        JPopupMenu menu = new JPopupMenu();
+        menu.add(new JCheckBoxMenuItem(new ToggleUserLayerAction()));
+        if( userMenu.getItemCount() > 0 )
+            menu.add(userMenu);
+        if( getRecipient() != null )
+            menu.add(new CloseTabAction());
+//        menu.add(new ClearPaneAction());
+//        menu.add(new LogoutAction());
+        return menu;
+    }
+
+    private class PopupAdapter extends MouseAdapter {
+        @Override public void mousePressed( MouseEvent e ) { check(e); }
+        @Override public void mouseReleased( MouseEvent e ) { check(e); }
+
+        private void check( MouseEvent e ) {
+            if( e.isPopupTrigger() ) {
+                createPopupMenu().show(tabs, e.getX(), e.getY());
+            }
+        }
+    }
+
     private class PrivateChatAction extends AbstractAction {
         private String userName;
@@ -407,5 +414,5 @@
         public CloseTabAction() {
             super(tr("Close tab"));
-            putValue(SMALL_ICON, ImageProvider.get("help"));
+//            putValue(SMALL_ICON, ImageProvider.get("help"));
         }
 
@@ -420,5 +427,5 @@
         public LogoutAction() {
             super(tr("Logout"));
-            putValue(SMALL_ICON, ImageProvider.get("help"));
+//            putValue(SMALL_ICON, ImageProvider.get("help"));
         }
 
@@ -431,5 +438,5 @@
         public ClearPaneAction() {
             super(tr("Clear log"));
-            putValue(SMALL_ICON, ImageProvider.get("help"));
+//            putValue(SMALL_ICON, ImageProvider.get("help"));
         }
 
@@ -442,5 +449,5 @@
         public ToggleUserLayerAction() {
             super(tr("Show users on map"));
-            putValue(SMALL_ICON, ImageProvider.get("help"));
+//            putValue(SMALL_ICON, ImageProvider.get("help"));
         }
 
Index: /applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java
===================================================================
--- /applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java	(revision 29562)
+++ /applications/editors/josm/plugins/geochat/src/geochat/JsonQueryUtil.java	(revision 29563)
@@ -29,5 +29,5 @@
             String serverURL = Main.pref.get("geochat.server", "http://zverik.dev.openstreetmap.org/osmochat.php?action=");
             URL url = new URL(serverURL + query);
-            System.out.println("GeoChat URL = " + url.toString());
+//            System.out.println("GeoChat URL = " + url.toString());
             HttpURLConnection connection = (HttpURLConnection)url.openConnection();
             connection.connect();