diff --git a/src/app/application.cpp b/src/app/application.cpp
index c1985f9f3..fd0015664 100644
--- a/src/app/application.cpp
+++ b/src/app/application.cpp
@@ -476,7 +476,7 @@ void Application::sendNotificationEmail(const BitTorrent::Torrent *torrent)
     auto *smtp = new Net::Smtp(this);
     smtp->sendMail(pref->getMailNotificationSender(),
                      pref->getMailNotificationEmail(),
-                     tr("[qBittorrent] '%1' has finished downloading").arg(torrent->name()),
+                     tr("Torrent \"%1\" has finished downloading").arg(torrent->name()),
                      content);
 }
 
diff --git a/src/base/net/smtp.cpp b/src/base/net/smtp.cpp
index 4c0149b7b..d34ef9edc 100644
--- a/src/base/net/smtp.cpp
+++ b/src/base/net/smtp.cpp
@@ -138,7 +138,7 @@ void Smtp::sendMail(const QString &from, const QString &to, const QString &subje
 {
     const Preferences *const pref = Preferences::instance();
     m_message = "Date: " + getCurrentDateTime().toLatin1() + "\r\n"
-                + encodeMimeHeader(u"From"_qs, from)
+                + encodeMimeHeader(u"From"_qs, u"qBittorrent <%1>"_qs.arg(from))
                 + encodeMimeHeader(u"Subject"_qs, subject)
                 + encodeMimeHeader(u"To"_qs, to)
                 + "MIME-Version: 1.0\r\n"