diff --git a/src/tetras-back b/src/tetras-back
index fb721b26e1ca37bcfcf7c8f88b8e6dfe33d892ee..4015a8b111a3712d752d9cb638b2ce4abb489e9d 100755
--- a/src/tetras-back
+++ b/src/tetras-back
@@ -197,6 +197,8 @@ sub do_backup($){
 sub do_sendmail($$){
     my ($subject, $message) = @_;
 
+    utf8::encode($subject);
+    utf8::encode($message);
     my $msg = MIME::Lite->new(
         From     => 'tetras-back',
         To       => 'root',
@@ -206,7 +208,7 @@ sub do_sendmail($$){
     $msg->attr("content-type.charset" => "UTF-8");
     $msg->attach(
         Type    => 'text/plain; charset=UTF-8',
-        Data    => utf8::encode($message),
+        Data    => $message,
     );
     # Add your text message.
     $msg->attach(Type        => 'text/plain; charset=UTF-8',
diff --git a/src/www/discs.php b/src/www/discs.php
index 5ba951ba99dfbb8bfa3c6657638ab499e9424aaa..f739777916d18b0806665b5d7497a61a1091b80c 100644
--- a/src/www/discs.php
+++ b/src/www/discs.php
@@ -36,7 +36,7 @@
     //add save button + text field that triggers tetras-back \-\-save uuid=name
     foreach ($conf['CONNECTED'] as $uuid => $dev) :
 ?>
-<tr><td><?php echo utf8_encode($dev) ?></td><td><?php echo utf8_encode($uuid) ?></td>
+<tr><td><?php echo $dev ?></td><td><?php echo $uuid ?></td>
 <td>
 <form action="actions.php" method="post">
 <input type="hidden" name="uuid" value="<?php echo $uuid ?>">
@@ -89,10 +89,10 @@ foreach ($conf['KNOWN'] as $uuid => $value) :
     }
 ?>
 <tr>
-    <td><?php echo utf8_encode($name) ?></td>
-    <td><?php echo utf8_encode($uuid) ?></td>
-    <td><?php echo utf8_encode($last_seen) ?></td>
-    <td><?php echo utf8_encode($last_backup_state) ?></td>
+    <td><?php echo $name ?></td>
+    <td><?php echo $uuid ?></td>
+    <td><?php echo $last_seen ?></td>
+    <td><?php echo $last_backup_state ?></td>
     <td>
         <form action="actions.php" method="post">
             <input type="hidden" name="name" value="<?php echo $name ?>">