diff --git a/adminer/create.inc.php b/adminer/create.inc.php
index ab8a4443..cd32b6ea 100644
--- a/adminer/create.inc.php
+++ b/adminer/create.inc.php
@@ -82,8 +82,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 	if (strlen($TABLE)) {
 		query_redirect("ALTER TABLE " . idf_escape($TABLE) . "$fields\nRENAME TO " . idf_escape($_POST["name"]) . ",\n$status", $location, lang('Table has been altered.'));
 	} else {
-		$path = preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]);
-		setcookie("adminer_engine", $_POST["Engine"], gmmktime(0, 0, 0, gmdate("n") + 1), $path);
+		cookie("adminer_engine", $_POST["Engine"]);
 		query_redirect("CREATE TABLE " . idf_escape($_POST["name"]) . " (" . substr($fields, 0, -1) . "\n) $status", $location, lang('Table has been created.'));
 	}
 }
diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 71d274ac..ac4e6b2e 100644
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -154,6 +154,15 @@ function where_link($i, $column, $value) {
 	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=%3D&where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
+/** Set cookie valid for 1 month
+* @param string
+* @param string
+* @return bool
+*/
+function cookie($name, $value) {
+	return setcookie($name, $value, gmmktime(0, 0, 0, gmdate("n") + 1), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
+}
+
 /** Send Location header and exit
 * @param string
 * @param string
diff --git a/adminer/include/lang.inc.php b/adminer/include/lang.inc.php
index b2c0198a..0f8b4154 100644
--- a/adminer/include/lang.inc.php
+++ b/adminer/include/lang.inc.php
@@ -44,7 +44,7 @@ if (isset($_GET["lang"])) {
 
 $LANG = "en";
 if (isset($langs[$_COOKIE["adminer_lang"]])) {
-	setcookie("adminer_lang", $_COOKIE["adminer_lang"], gmmktime(0, 0, 0, gmdate("n") + 1), preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]));
+	cookie("adminer_lang", $_COOKIE["adminer_lang"]);
 	$LANG = $_COOKIE["adminer_lang"];
 } elseif (isset($langs[$_SESSION["lang"]])) {
 	$LANG = $_SESSION["lang"];
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 6f1823fb..c7e4132c 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -185,7 +185,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
 		global $confirm;
 		if ($emailFields) {
 			echo '<fieldset><legend><a href="#fieldset-email" onclick="return !toggle(\'fieldset-email\');">' . lang('E-mail') . "</a></legend><div id='fieldset-email'" . ($_POST["email_append"] ? "" : " class='hidden'") . ">\n";
-			echo "<p>" . lang('From') . ": <input name='email_from' value='" . h($_POST["email_from"]) . "'>\n";
+			echo "<p>" . lang('From') . ": <input name='email_from' value='" . h($_POST ? $_POST["email_from"] : $_COOKIE["adminer_email"]) . "'>\n";
 			echo lang('Subject') . ": <input name='email_subject' value='" . h($_POST["email_subject"]) . "'>\n";
 			echo "<p><textarea name='email_message' rows='15' cols='60'>" . h($_POST["email_message"] . ($_POST["email_append"] ? '{$' . "$_POST[email_addition]}" : "")) . "</textarea><br>\n";
 			echo "<select name='email_addition'>" . optionlist($columns, $_POST["email_addition"]) . "</select> <input type='submit' name='email_append' value='" . lang('Insert') . "'>\n"; //! JavaScript
@@ -274,7 +274,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
 				foreach ($this->rowDescriptions($rows, $foreignKeys) as $row) {
 					$replace = array();
 					foreach ($matches[1] as $val) {
-						$replace['{$' . "$val}"] = $row[$val];
+						$replace['{$' . "$val}"] = $row[$val]; //! allow literal {$name}
 					}
 					$email = $row[$_POST["email_field"]];
 					if (is_email($email) && mail($email, email_header(strtr($subject, $replace)), strtr($message, $replace),
@@ -285,6 +285,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
 					}
 				}
 			}
+			cookie("adminer_email", $_POST["email_from"]);
 			redirect(remove_from_uri(), lang('%d e-mail(s) have been sent.', $sent));
 		}
 		return false;