diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index 21029929d566e505a2ca59017c9a6588c1c9eb02..3e926aeec7bd37c23626343586062c062d486733 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -73,6 +73,8 @@ class functions {
 			mail($to, $subject, "", $header);
 		} else {
 			$header = "From: $from\nReply-To: $from\n";
+			$header .= "Content-Type: text/plain;\n\tcharset=\"UTF-8\"\n";
+			$header .= "Content-Transfer-Encoding: 8bit\n\n";
 			mail($to, $subject, $text, $header);
 		}
 
diff --git a/server/conf/sieve_filter.master b/server/conf/sieve_filter.master
new file mode 100644
index 0000000000000000000000000000000000000000..2b4a9fc2f8dcbc49c7cc17e43d5c013d7ff20b3b
--- /dev/null
+++ b/server/conf/sieve_filter.master
@@ -0,0 +1,36 @@
+
+require ["fileinto", "regex", "vacation"];
+
+<tmpl_if name="cc">
+# Send a copy of email to
+redirect "<tmpl_var name='cc'>";
+keep;
+</tmpl_if>
+
+<tmpl_if name="move_junk" op="==" value="y">
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+  fileinto "Junk";
+  # Stop here so that we do not reply on spams
+  stop;
+}
+</tmpl_if>
+
+<tmpl_var name='custom_mailfilter'>
+
+<tmpl_if name="autoresponder" op="==" value="y">
+#################################################################
+# Autoreply
+#################################################################
+
+# Move spam to spam folder
+if header :contains "X-Spam-Flag" "YES" {
+  fileinto "Junk";
+  # Stop here so that we do not reply on spams
+  stop;
+}
+vacation  :days 1
+  :subject "Out of office reply"
+  # :addresses ["test@test.int", "till@test.int"]
+  "<tmpl_var name='autoresponder_text'>";
+</tmpl_if>
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7dc07fe748c96869aafa622b14089a561d498ee5..49bb90fa5ff117c887dd82b83c346c65ba198d49 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -167,7 +167,7 @@ class apache2_plugin {
 					$app->log("Creating CA-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
 					if (filesize($crt_file)==0 || !file_exists($crt_file)) $app->log("CA-Certificate signing failed.  openssl ca -out $crt_file -config ".$web_config['CA_path']."/openssl.cnf -passin pass:".$web_config['CA_pass']." -in $csr_file",LOGLEVEL_ERROR);
 				};
-				if (filesize($crt_file)==0 || !file_exists($crt_file)){
+				if (@filesize($crt_file)==0 || !file_exists($crt_file)){
 					exec("openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file ");
 					$app->log("Creating self-signed SSL Cert for: $domain",LOGLEVEL_DEBUG);
 				};