Index: /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 11170)
+++ /trunk/src/org/openstreetmap/josm/gui/GettingStarted.java	(revision 11171)
@@ -71,5 +71,5 @@
      * Grabs current MOTD from cache or webpage and parses it.
      */
-    private static class MotdContent extends CacheCustomContent<IOException> {
+    static class MotdContent extends CacheCustomContent<IOException> {
         MotdContent() {
             super("motd.html", CacheCustomContent.INTERVAL_DAILY);
@@ -161,10 +161,10 @@
     }
 
-    private String fixImageLinks(String s) {
-        Matcher m = Pattern.compile("src=\""+Main.getJOSMWebsite()+"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
+    static String fixImageLinks(String s) {
+        Matcher m = Pattern.compile("src=\"/browser/trunk(/images/.*?\\.png)\\?format=raw\"").matcher(s);
         StringBuffer sb = new StringBuffer();
         while (m.find()) {
             String im = m.group(1);
-            URL u = getClass().getResource(im);
+            URL u = GettingStarted.class.getResource(im);
             if (u != null) {
                 m.appendReplacement(sb, Matcher.quoteReplacement("src=\"" + u + '\"'));
Index: /trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java
===================================================================
--- /trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 11171)
+++ /trunk/test/functional/org/openstreetmap/josm/gui/GettingStartedTest.java	(revision 11171)
@@ -0,0 +1,47 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import static org.junit.Assert.assertFalse;
+
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+
+/**
+ * Tests the {@link GettingStarted} class.
+ */
+public class GettingStartedTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void init() {
+        JOSMFixture.createFunctionalTestFixture().init();
+    }
+
+    /**
+     * Tests that image links are replaced.
+     *
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testImageReplacement() throws IOException {
+        final String motd = new GettingStarted.MotdContent().updateIfRequiredString();
+        // assuming that the MOTD contains one image included, fixImageLinks changes the HTML string
+        assertFalse(GettingStarted.fixImageLinks(motd).equals(motd));
+    }
+
+    /**
+     * Tests that image links are replaced.
+     */
+    @Test
+    public void testImageReplacementStatic() {
+        final String html = "the download button <img src=\"/browser/trunk/images/download.png?format=raw\" " +
+                "alt=\"source:trunk/images/download.png\" title=\"source:trunk/images/download.png\" />.";
+        assertFalse(GettingStarted.fixImageLinks(html).equals(html));
+
+    }
+}