diff --git a/database.php b/database.php
index 9179ab6..94f497a 100644
--- a/database.php
+++ b/database.php
@@ -95,7 +95,7 @@ BODY;
 			} else {
 				$header = "References: <".$tag.">\r\nIn-reply-to: <".$tag.">\r\n";
 			}
-			mail($this->board,$subject,$body,$header."From: Voting System <returns@cacert.org>");
+			mail($this->board, mb_encode_mimeheader($subject,"UTF-8", "B", "\n"),$body,$header."From: Voting System <returns@cacert.org>");
 			//mail("testsympa@lists.cacert.org",$subject,$body,"From: Voting System <returns@cacert.org>");
 		}
 		function auth()
diff --git a/motions.php b/motions.php
index 38fc34d..90899b6 100644
--- a/motions.php
+++ b/motions.php
@@ -86,7 +86,7 @@ BODY;
 						</td>
 						<td>
 						<i><a href="motions.php?motion=<?php echo $row['tag'].'">'.$row['tag']; ?></a></i><br/>
-						<b><?php echo htmlentities($row['title']); ?></b><br/>
+						<b><?php echo htmlspecialchars($row['title']); ?></b><br/>
 						<pre><?php echo htmlspecialchars($row['content']); ?></pre>
 						<br/>
 						<i>Due: <?php echo($row['due']); ?> UTC</i><br/>