diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
index c4f5dc4a..6d28b443 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/PhoneUtils.kt
@@ -216,7 +216,7 @@ class PhoneUtils private constructor() {
                     val indexDuration = cursor.getColumnIndex(CallLog.Calls.DURATION)
                     val indexType = cursor.getColumnIndex(CallLog.Calls.TYPE)
                     val indexViaNumber = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && cursor.getColumnIndex("via_number") != -1) cursor.getColumnIndex("via_number") else -1
-                    var isSimId = false
+                    val isSimId = false
                     var indexSimId = -1
                     if (cursor.getColumnIndex("simid") != -1) {
                         indexSimId = cursor.getColumnIndex("simid")
@@ -396,7 +396,7 @@ class PhoneUtils private constructor() {
                     val indexBody = cursor.getColumnIndex("body")
                     val indexDate = cursor.getColumnIndex("date")
                     val indexType = cursor.getColumnIndex("type")
-                    var isSimId = false
+                    val isSimId = false
                     var indexSimId = -1
                     if (cursor.getColumnIndex("sim_id") != -1) {
                         indexSimId = cursor.getColumnIndex("sim_id")
diff --git a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt
index d16a376b..b966ecc3 100644
--- a/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt
+++ b/app/src/main/java/com/idormy/sms/forwarder/utils/mail/MailUtil.kt
@@ -50,11 +50,15 @@ object MailUtil {
             if (TextUtils.isEmpty(mail.fromNickname)) {
                 setFrom(InternetAddress(mail.fromAddress))
             } else {
-                val nickname = try {
-                    MimeUtility.encodeText(mail.fromNickname)
+                var nickname = mail.fromNickname.replace(":", "-").replace("\n", "-")
+                try {
+                    Log.d("createMailMessage", "nickname = $nickname")
+                    nickname = MimeUtility.encodeText(nickname)
                 } catch (e: UnsupportedEncodingException) {
                     e.printStackTrace()
                 }
+
+                Log.d("createMailMessage", "nickname = $nickname")
                 setFrom(InternetAddress("$nickname <${mail.fromAddress}>"))
             }
 
@@ -77,7 +81,12 @@ object MailUtil {
             setRecipients(Message.RecipientType.BCC, bccAddress)
 
             // 邮件主题
-            subject = mail.subject
+            subject = mail.subject.replace(":", "-").replace("\n", "-")
+            try {
+                subject = MimeUtility.encodeText(subject)
+            } catch (e: UnsupportedEncodingException) {
+                e.printStackTrace()
+            }
 
             // 邮件内容
             val contentPart = MimeMultipart()