Index: /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java	(revision 11195)
+++ /trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportDialog.java	(revision 11196)
@@ -100,5 +100,5 @@
         messageLabel.setMaxWidth(MAX_MESSAGE_SIZE);
         panel.add(messageLabel, GBC.eol().fill());
-        content.add(panel, GBC.eop().fill(GBC.HORIZONTAL).insets(20));
+        content.add(panel, GBC.eop().fill(GBC.HORIZONTAL).insets(20, 10, 10, 10));
     }
 
@@ -108,5 +108,5 @@
         panel.add(textPanel, GBC.eop().fill());
 
-        panel.add(new JLabel(tr("Manually report at:")), GBC.std());
+        panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std());
         panel.add(new UrlLabel(Main.getJOSMWebsite() + "/newticket"), GBC.std().fill(GBC.HORIZONTAL));
         JButton copy = new JButton("Copy to clipboard");
@@ -135,12 +135,14 @@
         panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
 
+        Component settings = GBC.glue(0, 0);
         if (ExpertToggleAction.isExpert()) {
             // The default settings should be fine in most situations.
-            panel.add(new BugReportSettingsPanel(report), GBC.eop().fill(GBC.HORIZONTAL));
-        }
+            settings = new BugReportSettingsPanel(report);
+        }
+        panel.add(settings);
 
         JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.get("bug"));
         sendBugReportButton.addActionListener(e -> sendBug());
-        panel.add(sendBugReportButton, GBC.eop().anchor(GBC.EAST));
+        panel.add(sendBugReportButton, GBC.eol().insets(0, 0, 0, 0).anchor(GBC.SOUTHEAST));
         content.add(panel, GBC.eop().fill(GBC.HORIZONTAL));
     }
@@ -148,5 +150,5 @@
     private static void addBorder(JPanel panel, String title) {
         panel.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createTitledBorder(title), BorderFactory
-                .createEmptyBorder(10, 10, 10, 10)));
+                .createEmptyBorder(5, 5, 5, 5)));
     }
 
@@ -162,5 +164,5 @@
         ignore.addActionListener(e -> closeDialog());
         panel.add(ignore, GBC.std(1, 0).span(1, 2).anchor(GBC.CENTER));
-        content.add(panel, GBC.eol().fill(GBC.HORIZONTAL).insets(20));
+        content.add(panel, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 10, 10));
     }
 
Index: /trunk/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java	(revision 11195)
+++ /trunk/src/org/openstreetmap/josm/tools/bugreport/DebugTextDisplay.java	(revision 11196)
@@ -29,5 +29,5 @@
         textArea.setEditable(false);
         setViewportView(textArea);
-        setPreferredSize(new Dimension(600, 300));
+        setPreferredSize(new Dimension(600, 270));
     }
 
Index: /trunk/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java	(revision 11195)
+++ /trunk/src/org/openstreetmap/josm/tools/bugreport/JosmUpdatePanel.java	(revision 11196)
@@ -35,7 +35,7 @@
         josmVersion = Version.getInstance().getVersion();
 
-        add(new JMultilineLabel(tr("Your current version of JOSM is {0}", josmVersion)), GBC.eop().fill(GBC.HORIZONTAL));
+        add(new JMultilineLabel(tr("Your current version of JOSM is {0}", josmVersion)), GBC.eol().fill(GBC.HORIZONTAL));
         testedVersionField = new JMultilineLabel(tr("JOSM is searching for updates..."));
-        add(testedVersionField, GBC.eop().fill(GBC.HORIZONTAL));
+        add(testedVersionField, GBC.eol().fill(GBC.HORIZONTAL));
 
         checkCurrentVersion();