Index: /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 26935)
+++ /applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 26936)
@@ -30,10 +30,25 @@
             <link name="View URL" href="%v%" />
         </rule>
+        <rule>
+            <condition k="email" v="[^@]+@[^@]+" />
+            <link name="Send Email" href="mailto:%v%" />
+        </rule>
+        <rule>
+            <condition k="contact:email"  v="[^@]+@[^@]+" />
+            <link name="Send Email" href="mailto:%v%" />
+        </rule>
     </source>
     
     <source name="Wikipedia">
         <rule>
-            <condition k="wikipedia(?::([\p{Lower}]{2,}))?" v="(?:([\p{Lower}]{2,}):)?(.*)" />
+            <condition k="wikipedia(?::(\p{Lower}{2,}))?" v="(?:(\p{Lower}{2,}):)?(.*)" />
             <link name="View %name% article" href="http://%k.1:v.1:en%.wikipedia.org/wiki/%v.2:v.1%" />
+        </rule>
+    </source>
+
+    <source name="WHC">
+        <rule>
+            <condition k="ref:whc" v="\p{Digit}+" />
+            <link name="View UNESCO sheet" href="http://whc.unesco.org/%lang(en,fr):en%/list/%v%" />
         </rule>
     </source>
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 26935)
+++ /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkPlugin.java	(revision 26936)
@@ -26,8 +26,9 @@
 
 /**
- * Main class of tag2links plugin.
+ * Main class of tag2link plugin.
  * @author Don-vip
- * @version 0.1b
+ * @version 0.2a
  * History:
+ * 0.2a 23-Oct-2011 add Mail support + initial work on UNESCO WHC
  * 0.1c 23-Oct-2011 add MHS rule (French heritage)
  * 0.1b 22-Oct-2011 add CEF rule (French christian churches)
Index: /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java
===================================================================
--- /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 26935)
+++ /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/Tag2LinkRuleChecker.java	(revision 26936)
@@ -74,4 +74,14 @@
 						}
 					}
+					if (val == null) {
+						Matcher lm = Pattern.compile("lang(?:\\(\\p{Lower}{2,}(?:,\\p{Lower}{2,})*\\))?(?::(\\p{Lower}{2,}))?").matcher(arg);
+						if (lm.matches()) {
+							if (lm.groupCount() == 0) {
+								// TODO: get JOSM current language
+							} else {
+								// TODO: parse next groups
+							}
+						}
+					}
 					if (val != null) {
 						try {
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 26935)
+++ /applications/editors/josm/plugins/tag2link/src/org/openstreetmap/josm/plugins/tag2link/action/OpenLinkAction.java	(revision 26936)
@@ -3,5 +3,7 @@
 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;
@@ -22,4 +24,14 @@
     @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);