Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java	(revision 22928)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/GeorefImage.java	(revision 22929)
@@ -99,5 +99,5 @@
 
 	private BufferedImage createImage() {
-		return new BufferedImage(layer.getImageWidth(xIndex), layer.getImageHeight(yIndex), BufferedImage.TYPE_INT_RGB);
+		return new BufferedImage(layer.getBaseImageWidth(), layer.getBaseImageHeight(), BufferedImage.TYPE_INT_RGB);
 	}
 
@@ -217,7 +217,7 @@
 		return yIndex;
 	}
-	
+
 	public void setLayer(WMSLayer layer) {
-	    this.layer = layer;
+		this.layer = layer;
 	}
 }
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java	(revision 22928)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Grabber.java	(revision 22929)
@@ -52,8 +52,8 @@
 
 	int width(){
-		return layer.getImageWidth(request.getXIndex());
+		return layer.getBaseImageWidth();
 	}
 	int height(){
-		return layer.getImageHeight(request.getYIndex());
+		return layer.getBaseImageHeight();
 	}
 
Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java
===================================================================
--- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 22928)
+++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayer.java	(revision 22929)
@@ -297,4 +297,23 @@
 	/**
 	 *
+	 * @return Size of image in original zoom
+	 */
+	public int getBaseImageWidth() {
+		int overlap = (WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_EAST.get() * imageSize / 100:0);
+		return imageSize + overlap;
+	}
+
+	/**
+	 *
+	 * @return Size of image in original zoom
+	 */
+	public int getBaseImageHeight() {
+		int overlap = (WMSPlugin.PROP_OVERLAP.get()?WMSPlugin.PROP_OVERLAP_NORTH.get() * imageSize / 100:0);
+		return imageSize + overlap;
+	}
+
+
+	/**
+	 *
 	 * @param xIndex
 	 * @param yIndex