diff --git a/admin/communication.php b/admin/communication.php
index ad5ffce..400d295 100644
--- a/admin/communication.php
+++ b/admin/communication.php
@@ -244,6 +244,9 @@ case 'dialog_edit':
 			</tr>
 			<?
 		}
+		else if($key)  {
+			echo "<input type=\"hidden\" name=\"key\" value=\"$key\" />\n";
+		}
 		else {
 			?>
 			<tr>
@@ -725,12 +728,12 @@ case "email_get_list":
 		echo "</select>";
 		echo "</td></tr>";
 		echo "<tr><td><b>Date:</b></td><td>".date("r")."</td></tr>";
-		echo "<tr><td><b>Subject:</b></td><td>".htmlspecialchars($r->subject)."</td></tr>";
+		echo "<tr><td><b>Subject:</b></td><td>".htmlspecialchars(iconv("utf-8","ISO-8859-1",$r->subject))."</td></tr>";
 		if($r->bodyhtml) {
-			$body=$r->bodyhtml;
+			$body=iconv("utf-8","ISO-8859-1",$r->bodyhtml);
 		}
 		else
-			$body=nl2br(htmlspecialchars($r->body));
+			$body=nl2br(htmlspecialchars(iconv("utf-8","ISO-8859-1",$r->body)));
 
 		echo "<tr><td colspan=2>".$body."</td></tr>";
 
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index a2ecc45..bb79365 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-154
+155
diff --git a/db/db.update.155.php b/db/db.update.155.php
new file mode 100644
index 0000000..51a3a05
--- /dev/null
+++ b/db/db.update.155.php
@@ -0,0 +1,14 @@
+<?
+
+function db_update_154_post() {
+	$q=mysql_query("SELECT * FROM emails");
+	while($r=mysql_fetch_object($q)) {
+		mysql_query("UPDATE emails SET
+		body='".mysql_real_escape_string(iconv("ISO-8859-1","UTF-8",$r->body))."' ,
+		bodyhtml='".mysql_real_escape_string(iconv("ISO-8859-1","UTF-8",$r->bodyhtml))."' ,
+		subject='".mysql_real_escape_string(iconv("ISO-8859-1","UTF-8",$r->subject))."'
+		WHERE id='$r->id'");
+	}
+}
+
+?>
diff --git a/db/db.update.155.sql b/db/db.update.155.sql
new file mode 100644
index 0000000..6c8e8ab
--- /dev/null
+++ b/db/db.update.155.sql
@@ -0,0 +1,7 @@
+ALTER TABLE `emails` CHANGE `body` `body` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emails` CHANGE `bodyhtml` `bodyhtml` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emails` CHANGE `subject` `subject` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emailqueue` CHANGE `body` `body` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emailqueue` CHANGE `bodyhtml` `bodyhtml` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emailqueue` CHANGE `subject` `subject` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;
+ALTER TABLE `emailqueue_recipients` CHANGE `replacements` `replacements` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;