diff --git a/src/filter/autotests/gpgdata/text-plain.msg b/src/filter/autotests/gpgdata/text-plain.msg
--- a/src/filter/autotests/gpgdata/text-plain.msg
+++ b/src/filter/autotests/gpgdata/text-plain.msg
@@ -1,4 +1,4 @@
-From: Daniel Vratil <dvratil@kde.org>
+From: "Daniel Vratil (test)" <dvratil@kde.org>
 To: KMail Test <kmail@test.kde>
 Date: Tue, 01 Aug 2017 07:50:04 +0000
 Subject: It's time to get schwifty!
diff --git a/src/filter/autotests/gpgdata/text-plain.msg.pgp b/src/filter/autotests/gpgdata/text-plain.msg.pgp
--- a/src/filter/autotests/gpgdata/text-plain.msg.pgp
+++ b/src/filter/autotests/gpgdata/text-plain.msg.pgp
@@ -1,4 +1,4 @@
-From: Daniel Vratil <dvratil@kde.org>
+From: "Daniel Vratil (test)" <dvratil@kde.org>
 To: KMail Test <kmail@test.kde>
 Date: Tue, 01 Aug 2017 07:50:04 +0000
 Subject: It's time to get schwifty!
diff --git a/src/filter/autotests/gpgdata/text-plain.msg.smime b/src/filter/autotests/gpgdata/text-plain.msg.smime
--- a/src/filter/autotests/gpgdata/text-plain.msg.smime
+++ b/src/filter/autotests/gpgdata/text-plain.msg.smime
@@ -1,4 +1,4 @@
-From: Daniel Vratil <dvratil@kde.org>
+From: "Daniel Vratil (test)" <dvratil@kde.org>
 To: KMail Test <kmail@test.kde>
 Date: Tue, 01 Aug 2017 07:50:04 +0000
 Subject: It's time to get schwifty!
diff --git a/src/util/cryptoutils.cpp b/src/util/cryptoutils.cpp
--- a/src/util/cryptoutils.cpp
+++ b/src/util/cryptoutils.cpp
@@ -164,7 +164,7 @@
     if (!newHdr) {
         newHdr = new KMime::Headers::Generic(header->type());
     }
-    newHdr->fromUnicodeString(header->asUnicodeString(), "UTF-8");
+    newHdr->from7BitString(header->as7BitString(false));
     msg->appendHeader(newHdr);
 }