diff --git a/privatemsg_mail_edit/privatemsg_mail_edit.info b/privatemsg_mail_edit/privatemsg_mail_edit.info
new file mode 100644
index 0000000..3a1f876
--- /dev/null
+++ b/privatemsg_mail_edit/privatemsg_mail_edit.info
@@ -0,0 +1,7 @@
+name = Privatemsg Mail Editor Integration
+description = Integrates Privatemsg e-mail notifications with Mail Editor
+package = Mail
+core = 7.x
+dependencies[] = privatemsg
+dependencies[] = pm_email_notify
+dependencies[] = mail_edit
diff --git a/privatemsg_mail_edit/privatemsg_mail_edit.module b/privatemsg_mail_edit/privatemsg_mail_edit.module
new file mode 100644
index 0000000..5fe413f
--- /dev/null
+++ b/privatemsg_mail_edit/privatemsg_mail_edit.module
@@ -0,0 +1,46 @@
+<?php
+
+/**
+ * @file
+ * An implementation of Mail Editor hooks for the Privatemsg module (based
+ * on the built-in Logintoboggan support).
+ *
+ */
+
+/**
+ * Implements hook_mailkeys().
+ *
+ * @return array|null
+ */
+function privatemsg_mailkeys() {
+  if (module_exists('privatemsg')) {
+    return user_mailkeys() + array(
+      'pm_email_notify' => t('Privatemsg e-mail notifications'),
+    );
+  }
+  return NULL;
+}
+
+/**
+ * Implements hook_mail_edit_text().
+ *
+ * @param string $mailkey
+ * @param string $language
+ *
+ * @return array
+ */
+function privatemsg_mail_edit_text($mailkey, $language) {
+  return user_mail_edit_text($mailkey, $language);
+}
+
+/**
+ * Implements hook_mail_edit_token_types().
+ *
+ * @param string $mailkey
+ *
+ * @return array
+ */
+function privatemsg_mail_edit_token_types($mailkey) {
+  return user_mail_edit_token_types($mailkey);
+}
+