Index: /applications/editors/josm/plugins/terracer/build.xml
===================================================================
--- /applications/editors/josm/plugins/terracer/build.xml	(revision 21168)
+++ /applications/editors/josm/plugins/terracer/build.xml	(revision 21169)
@@ -32,5 +32,5 @@
 
 
-    <property name="commit.message" value="Remember the interpolation setting between restarts" />
+    <property name="commit.message" value="Fix the message text (and remove the now redundant message popup)" />
     <property name="plugin.main.version" value="3210" />
 
Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 21168)
+++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputDialog.java	(revision 21169)
@@ -17,4 +17,5 @@
 import java.awt.Frame;
 import java.awt.GridBagLayout;
+import java.awt.GridBagConstraints;
 import java.awt.GridLayout;
 import java.awt.event.ActionEvent;
@@ -105,4 +106,5 @@
         setupDialog();
         setVisible(true);
+        lo.requestFocus();
     }
 
@@ -126,6 +128,22 @@
     private Container getJContentPane() {
         if (jContentPane == null) {
-        
-            messageLabel = new JTextArea();
+            jContentPane = this.getContentPane();
+            jContentPane.setLayout(new BoxLayout(jContentPane, BoxLayout.Y_AXIS));
+            jContentPane.add(getInputPanel(), jContentPane);
+        }
+        return jContentPane;
+    }
+
+    /**
+     * This method initializes inputPanel
+     *
+     * @return javax.swing.JPanel
+     */
+    private JPanel getInputPanel() {
+        if (inputPanel == null) {
+
+        	GridBagConstraints c = new GridBagConstraints();
+
+        	messageLabel = new JTextArea();
             messageLabel.setText(DEFAULT_MESSAGE);
             messageLabel.setAutoscrolls(true);
@@ -135,20 +153,6 @@
             messageLabel.setBackground(new Color(238, 238, 238));
             messageLabel.setEditable(false);
+            messageLabel.setFocusable(false); // Needed so that lowest number can have focus immediately
             
-            jContentPane = this.getContentPane();
-            jContentPane.setLayout(new BoxLayout(jContentPane, BoxLayout.Y_AXIS));
-            jContentPane.add(messageLabel, jContentPane);
-            jContentPane.add(getInputPanel(), jContentPane);
-        }
-        return jContentPane;
-    }
-
-    /**
-     * This method initializes inputPanel
-     *
-     * @return javax.swing.JPanel
-     */
-    private JPanel getInputPanel() {
-        if (inputPanel == null) {
             interpolationLabel = new JLabel();
             interpolationLabel.setText(tr("Interpolation"));
@@ -170,4 +174,8 @@
             inputPanel = new JPanel();
             inputPanel.setLayout(new GridBagLayout());
+            c.fill = GridBagConstraints.HORIZONTAL;
+			c.gridwidth = GridBagConstraints.REMAINDER;
+            inputPanel.add(messageLabel, c);
+            
             inputPanel.add(loLabel, GBC.std().insets(3,3,0,0));
             inputPanel.add(getLo(), GBC.eol().fill(GBC.HORIZONTAL).insets(5,3,0,0));
@@ -207,5 +215,4 @@
             lo = new JTextField();
             lo.setText("");
-            lo.requestFocus();
         }
         return lo;
Index: /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java
===================================================================
--- /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 21168)
+++ /applications/editors/josm/plugins/terracer/src/terracer/HouseNumberInputHandler.java	(revision 21169)
@@ -138,5 +138,5 @@
 	        dialog.messageLabel.setForeground(Color.red);
 	        dialog.messageLabel.setText(message.toString());
-	        JOptionPane.showMessageDialog(null, message.toString(), tr("Error"), JOptionPane.ERROR_MESSAGE);
+	        //JOptionPane.showMessageDialog(null, message.toString(), tr("Error"), JOptionPane.ERROR_MESSAGE);
 
             return false;