diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 079b1c205d..6e142bb2da 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -836,7 +836,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
                     block.Access = 254; // means 'simulator is offline'
                     response.Add(block);
                 }
-                remoteClient.SendMapBlock(response, 0);
+                if ((flag & 2) == 2) // V2 !!!
+                    remoteClient.SendMapBlock(response, 2);
+                else
+                    remoteClient.SendMapBlock(response, 0);
             }
             else
             {
@@ -849,17 +852,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         {
             List<MapBlockData> mapBlocks = new List<MapBlockData>();
             List<GridRegion> regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID,
-                (minX - 8) * (int)Constants.RegionSize, 
-                (maxX + 8) * (int)Constants.RegionSize,
-                (minY - 8) * (int)Constants.RegionSize,
-                (maxY + 8) * (int)Constants.RegionSize);
+                (minX - 4) * (int)Constants.RegionSize, 
+                (maxX + 4) * (int)Constants.RegionSize,
+                (minY - 4) * (int)Constants.RegionSize,
+                (maxY + 4) * (int)Constants.RegionSize);
             foreach (GridRegion r in regions)
             {
                 MapBlockData block = new MapBlockData();
                 MapBlockFromGridRegion(block, r);
                 mapBlocks.Add(block);
             }
-            remoteClient.SendMapBlock(mapBlocks, 0);
+            if ((flag & 2) == 2) // V2 !!!
+                remoteClient.SendMapBlock(mapBlocks, 2);
+            else
+                remoteClient.SendMapBlock(mapBlocks, 0);
 
             return mapBlocks;
         }
diff --git a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
index 9448af743b..76dd695fe7 100644
--- a/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
+++ b/OpenSim/Server/Handlers/Map/MapGetServerConnector.cs
@@ -83,13 +83,12 @@ namespace OpenSim.Server.Handlers.MapImage
 
             string format = string.Empty;
             result = m_MapService.GetMapTile(path.Trim('/'), out format);
-
             if (result.Length > 0)
             {
                 httpResponse.StatusCode = (int)HttpStatusCode.OK;
-                if (format.Equals("png"))
+                if (format.Equals(".png"))
                     httpResponse.ContentType = "image/png";
-                else if (format.Equals("jpg") || format.Equals("jpeg"))
+                else if (format.Equals(".jpg") || format.Equals(".jpeg"))
                     httpResponse.ContentType = "image/jpeg";
             }
             else
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index 596c4a6f48..ee424e14f3 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -134,7 +134,7 @@ namespace OpenSim.Services.MapImageService
 
         public byte[] GetMapTile(string fileName, out string format)
         {
-            format = "jpg";
+            format = ".jpg";
             string fullName = Path.Combine(m_TilesStoragePath, fileName);
             if (File.Exists(fullName))
             {