Index: applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml
===================================================================
--- applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 27303)
+++ applications/editors/josm/plugins/tag2link/resources/tag2link_sources.xml	(revision 27304)
@@ -23,5 +23,5 @@
     <source name="Common">
         <rule>
-            <condition k="website" />
+            <condition k="(contact:)?website" />
             <link name="View website" href="%v%" />
         </rule>
@@ -31,9 +31,5 @@
         </rule>
         <rule>
-            <condition k="email" v="[^@]+@[^@]+" />
-            <link name="Send Email" href="mailto:%v%" />
-        </rule>
-        <rule>
-            <condition k="contact:email"  v="[^@]+@[^@]+" />
+            <condition k="(contact:)?email" v="[^@]+@[^@]+" />
             <link name="Send Email" href="mailto:%v%" />
         </rule>