2 files changed, 27 insertions, 20 deletions
diff --git a/plugins/mailto/init.js b/plugins/mailto/init.js
index 92a90f8e9..f81f70fc7 100644
--- a/plugins/mailto/init.js
+++ b/plugins/mailto/init.js
@@ -1,27 +1,34 @@
-function mailtoArticle(id) {
-	if (!id) {
-		const ids = Headlines.getSelected();
+Plugins.Mailto = {
+	send: function (id) {
+		if (!id) {
+			const ids = Headlines.getSelected();
 
-		if (ids.length == 0) {
-			alert(__("No articles selected."));
-			return;
-		}
+			if (ids.length == 0) {
+				alert(__("No articles selected."));
+				return;
+			}
 
-		id = ids.toString();
-	}
+			id = ids.toString();
+		}
 
-	if (dijit.byId("emailArticleDlg"))
-		dijit.byId("emailArticleDlg").destroyRecursive();
+		if (dijit.byId("emailArticleDlg"))
+			dijit.byId("emailArticleDlg").destroyRecursive();
 
-	const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
+		const query = "backend.php?op=pluginhandler&plugin=mailto&method=emailArticle&param=" + encodeURIComponent(id);
 
-	const dialog = new dijit.Dialog({
-		id: "emailArticleDlg",
-		title: __("Forward article by email"),
-		style: "width: 600px",
-		href: query});
+		const dialog = new dijit.Dialog({
+			id: "emailArticleDlg",
+			title: __("Forward article by email"),
+			style: "width: 600px",
+			href: query});
 
-	dialog.show();
-}
+		dialog.show();
+	}
+};
 
+// override default hotkey action if enabled
+Plugins.Mail = Plugins.Mail || {};
 
+Plugins.Mail.onHotkey = function(id) {
+	Plugins.Mailto.send(id);
+};
+\ No newline at end of file
diff --git a/plugins/mailto/init.php b/plugins/mailto/init.php
index 60c58b707..3dbc8d643 100644
--- a/plugins/mailto/init.php
+++ b/plugins/mailto/init.php
@@ -21,7 +21,7 @@ class MailTo extends Plugin {
 	function hook_article_button($line) {
 		return "<img src=\"plugins/mailto/mail.png\"
 					class='tagsPic' style=\"cursor : pointer\"
-					onclick=\"mailtoArticle(".$line["id"].")\"
+					onclick=\"Plugins.Mailto.send(".$line["id"].")\"
 					alt='Zoom' title='".__('Forward by email')."'>";
 	}