diff --git a/plugins/email-table.php b/plugins/email-table.php
new file mode 100644
index 00000000..5c897ccd
--- /dev/null
+++ b/plugins/email-table.php
@@ -0,0 +1,51 @@
+<?php
+
+/** Get e-mail subject and message from database (Adminer Editor)
+* @author Jakub Vrana, http://www.vrana.cz/
+* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+*/
+class AdminerEmailTable {
+	var $table, $id, $title, $subject, $message;
+	
+	/**
+	* @param string quoted table name
+	* @param string quoted column name
+	* @param string quoted column name
+	* @param string quoted column name
+	* @param string quoted column name
+	*/
+	function AdminerEmailTable($table = "email", $id = "id", $title = "subject", $subject = "subject", $message = "message") {
+		$this->table = $table;
+		$this->id = $id;
+		$this->title = $title;
+		$this->subject = $subject;
+		$this->message = $message;
+	}
+	
+	function selectEmailPrint($emailFields, $columns) {
+		if ($emailFields) {
+			print_fieldset("email", ('E-mail'));
+			echo "<div onkeydown=\"eventStop(event); return bodyKeydown(event, 'email');\">\n";
+			echo "<p>" . ('From') . ": <input name='email_from' value='" . h($_POST ? $_POST["email_from"] : $_COOKIE["adminer_email"]) . "'>\n";
+			echo ('Subject') . ": <select name='email_id'><option>" . optionlist(get_key_vals("SELECT $this->id, $this->title FROM $this->table ORDER BY $this->title"), $_POST["email_id"], true) . "</select>\n";
+			echo "<p>" . ('Attachments') . ": <input type='file' name='email_files[]' onchange=\"this.onchange = function () { }; var el = this.cloneNode(true); el.value = ''; this.parentNode.appendChild(el);\">";
+			echo "<p>" . (count($emailFields) == 1 ? '<input type="hidden" name="email_field" value="' . h(key($emailFields)) . '">' : html_select("email_field", $emailFields));
+			echo "<input type='submit' name='email' value='" . ('Send') . "' onclick=\"return this.form['delete'].onclick();\">\n";
+			echo "</div>\n";
+			echo "</div></fieldset>\n";
+			return true;
+		}
+	}
+	
+	function selectEmailProcess($where, $foreignKeys) {
+		$connection = connection();
+		if ($_POST["email_id"]) {
+			$result = $connection->query("SELECT $this->subject, $this->message FROM $this->table WHERE $this->id = " . q($_POST["email_id"]));
+			$row = $result->fetch_row();
+			$_POST["email_subject"] = $row[0];
+			$_POST["email_message"] = $row[1];
+		}
+	}
+	
+}