Index: trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java	(revision 13976)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java	(revision 13978)
@@ -24,4 +24,5 @@
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.TextUtils;
 
 /**
@@ -40,5 +41,6 @@
         Font font = getFont().deriveFont(Font.PLAIN, 14.0f);
         JMultilineLabel nagLabel = new JMultilineLabel(
-                tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName()));
+                tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!",
+                        TextUtils.wrapLongUrl(infoToAdd.getName())));
         UrlLabel detailsList = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Using_Imagery"), tr("Details..."));
         nagLabel.setFont(font);
Index: trunk/src/org/openstreetmap/josm/tools/TextUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/TextUtils.java	(revision 13978)
+++ trunk/src/org/openstreetmap/josm/tools/TextUtils.java	(revision 13978)
@@ -0,0 +1,23 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+/**
+ * Text/String utils.
+ * @since 13978
+ */
+public final class TextUtils {
+
+    private TextUtils() {
+        // Hide default constructor for utils classes
+    }
+
+    /**
+     * Inserts zero width space character (U+8203) after each slash/amperand to wrap long URLs.
+     * @param url URL
+     * @return wrapped URL
+     * @since 13978
+     */
+    public static String wrapLongUrl(String url) {
+        return url.replaceAll("/", "/\u200b").replaceAll("&", "&\u200b");
+    }
+}