Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkConstants.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkConstants.java	(revision 26963)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkConstants.java	(revision 26964)
@@ -39,3 +39,5 @@
 	public static String ICON_24 = "tag2linkv2_24x24.png";
     public static String ICON_48 = "tag2linkv2_48x48.png";
+    
+    public static String MAIL_ICON_24 = "tag2mailv3_24x24.png";
 }
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java	(revision 26963)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java	(revision 26964)
@@ -29,4 +29,5 @@
  * @author Don-vip
  * History:
+ * 0.2d 24-Oct-2011 Icon for Mail action
  * 0.2c 24-Oct-2011 Another MHS rule
  * 0.2b 24-Oct-2011 UNESCO WHC rule working
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java	(revision 26963)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java	(revision 26964)
@@ -3,7 +3,5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Desktop;
 import java.awt.event.ActionEvent;
-import java.net.URI;
 
 import org.openstreetmap.josm.actions.JosmAction;
@@ -24,14 +22,4 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-    	if (url.matches("mailto:.*")) {
-        	if (Desktop.isDesktopSupported()) {
-        		try {
-        			System.out.println("Sending "+url);
-					Desktop.getDesktop().mail(new URI(url));
-				} catch (Exception ex) {
-					ex.printStackTrace();
-				}
-        	}
-    	}
     	System.out.println("Opening "+url);
         OpenBrowser.displayUrl(url);
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenMailAction.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenMailAction.java	(revision 26964)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenMailAction.java	(revision 26964)
@@ -0,0 +1,34 @@
+package org.openstreetmap.josm.plugins.tag2link.action;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Desktop;
+import java.awt.event.ActionEvent;
+import java.net.URI;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.plugins.tag2link.Tag2LinkConstants;
+import org.openstreetmap.josm.plugins.tag2link.data.Link;
+
+@SuppressWarnings("serial")
+public class OpenMailAction extends JosmAction implements Tag2LinkConstants {
+	
+    private String url;
+    
+    public OpenMailAction(Link link) {
+        super(tr(link.name), MAIL_ICON_24, tr("Launch your default software for sending an email to the selected contact address"), null, false);
+        this.url = link.url;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+    	if (Desktop.isDesktopSupported()) {
+    		try {
+    			System.out.println("Sending "+url);
+				Desktop.getDesktop().mail(new URI(url));
+			} catch (Exception ex) {
+				ex.printStackTrace();
+			}
+    	}
+    }
+}
Index: applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/listeners/AbstractPopupListener.java
===================================================================
--- applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/listeners/AbstractPopupListener.java	(revision 26963)
+++ applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/listeners/AbstractPopupListener.java	(revision 26964)
@@ -24,6 +24,8 @@
 import javax.swing.event.PopupMenuListener;
 
+import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.tag2link.action.OpenLinkAction;
+import org.openstreetmap.josm.plugins.tag2link.action.OpenMailAction;
 import org.openstreetmap.josm.plugins.tag2link.data.Link;
 
@@ -52,5 +54,12 @@
     
     protected void addLink(JPopupMenu popup, Link link) {
-        itemList.add(popup.add(new OpenLinkAction(link)));
+    	JosmAction action = null;
+    	if (link.url.matches("mailto:.*")) {
+    		action = new OpenMailAction(link);
+    	} else {
+    		action = new OpenLinkAction(link);
+    	}
+
+        itemList.add(popup.add(action));
     }
 }