diff --git a/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings
index b82861a..315a92f 100644
Binary files a/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/en.lproj/Localizable.strings differ
diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings
index 5a30397..273c261 100644
Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/zh-Hans.lproj/Localizable.strings differ
diff --git a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings
index 3b0bee6..d72fbe4 100644
Binary files a/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings and b/WeChatTweak.framework/Versions/A/Resources/zh-Hant.lproj/Localizable.strings differ
diff --git a/WeChatTweak.framework/Versions/A/WeChatTweak b/WeChatTweak.framework/Versions/A/WeChatTweak
index da1ffae..b9b77e0 100755
Binary files a/WeChatTweak.framework/Versions/A/WeChatTweak and b/WeChatTweak.framework/Versions/A/WeChatTweak differ
diff --git a/WeChatTweak/Supporting Files/WeChatTweakHeaders.h b/WeChatTweak/Supporting Files/WeChatTweakHeaders.h
index 4906121..69a9f32 100644
--- a/WeChatTweak/Supporting Files/WeChatTweakHeaders.h	
+++ b/WeChatTweak/Supporting Files/WeChatTweakHeaders.h	
@@ -11,6 +11,15 @@
 #import <objc/runtime.h>
 #import <objc/message.h>
 
+typedef NS_ENUM(unsigned int, MessageDataType) {
+    MessageDataTypeText     = 1,
+    MessageDataTypeImage    = 3,
+    MessageDataTypeVoice    = 34,
+    MessageDataTypeVideo    = 43,
+    MessageDataTypeSticker  = 47,
+    MessageDataTypeLink     = 49,
+};
+
 @interface NSString (MD5)
 
 - (NSString *)md5String;
@@ -43,7 +52,7 @@
 
 @interface MessageData: NSObject
 
-@property(nonatomic) unsigned int messageType;
+@property(nonatomic) MessageDataType messageType;
 @property(nonatomic) unsigned int msgStatus;
 @property(nonatomic) long long mesSvrID;
 @property(retain, nonatomic) NSString *toUsrName;
diff --git a/WeChatTweak/Supporting Files/en.lproj/Localizable.strings b/WeChatTweak/Supporting Files/en.lproj/Localizable.strings
index f94baff..3c22609 100644
--- a/WeChatTweak/Supporting Files/en.lproj/Localizable.strings	
+++ b/WeChatTweak/Supporting Files/en.lproj/Localizable.strings	
@@ -10,7 +10,7 @@
 "Tweak.Title.Group" = "Group";
 "Tweak.Message.CatchARecalledMessage" = "[Catched]\n%@";
 "Tweak.Message.Recalled" = "recalled";
-"Tweak.Message.Photo" = "Photo";
+"Tweak.Message.Image" = "Image";
 "Tweak.Message.Voice" = "Voice";
 "Tweak.Message.Video" = "Video";
 "Tweak.Message.Sticker" = "Sticker";
diff --git a/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings b/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings
index c6f429b..7386462 100644
--- a/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings	
+++ b/WeChatTweak/Supporting Files/zh-Hans.lproj/Localizable.strings	
@@ -10,7 +10,7 @@
 "Tweak.Title.Group" = "群组";
 "Tweak.Message.CatchARecalledMessage" = "[已拦截]\n%@";
 "Tweak.Message.Recalled" = "撤回了";
-"Tweak.Message.Photo" = "图片";
+"Tweak.Message.Image" = "图片";
 "Tweak.Message.Voice" = "语音";
 "Tweak.Message.Video" = "视频";
 "Tweak.Message.Sticker" = "表情";
diff --git a/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings b/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings
index 0a20728..71e0d12 100644
--- a/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings	
+++ b/WeChatTweak/Supporting Files/zh-Hant.lproj/Localizable.strings	
@@ -10,7 +10,7 @@
 "Tweak.Title.Group" = "群組";
 "Tweak.Message.CatchARecalledMessage" = "[已攔截]\n%@";
 "Tweak.Message.Recalled" = "撤回了";
-"Tweak.Message.Photo" = "图片";
+"Tweak.Message.Image" = "图片";
 "Tweak.Message.Voice" = "语音";
 "Tweak.Message.Video" = "视频";
 "Tweak.Message.Sticker" = "表情";
diff --git a/WeChatTweak/WeChatTweak.m b/WeChatTweak/WeChatTweak.m
index 8e6e299..f3a93aa 100755
--- a/WeChatTweak/WeChatTweak.m
+++ b/WeChatTweak/WeChatTweak.m
@@ -95,12 +95,12 @@ static void __attribute__((constructor)) tweak(void) {
         if ([localMessageData isSendFromSelf]) {
             data.msgContent = replaceMessage;
         } else {
-            NSString *fromUserName = [[replaceMessage stringByReplacingOccurrencesOfString:@"\"" withString:@""] componentsSeparatedByString:@" "].firstObject;
-            NSString *userRevoke = [NSString stringWithFormat:@"\"%@\" %@ ", fromUserName, [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Recalled"]];
+            NSString *fromUserName = [replaceMessage componentsSeparatedByString:@" "].firstObject;
+            NSString *userRevoke = [NSString stringWithFormat:@"%@ %@ ", fromUserName, [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Recalled"]];
             NSString *tips = [NSString stringWithFormat:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.CatchARecalledMessage"], userRevoke];
             NSMutableString *msgContent = [NSMutableString stringWithString:tips];
             switch (localMessageData.messageType) {
-                case 1: { //Text
+                case MessageDataTypeText: {
                     if (localMessageData.msgContent.length) {
                         if ([session rangeOfString:@"@chatroom"].location == NSNotFound) {
                             [msgContent appendFormat:@"\"%@\"", localMessageData.msgContent];
@@ -112,15 +112,15 @@ static void __attribute__((constructor)) tweak(void) {
                     }
                     break;
                 }
-                case 3:  //Photo
-                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Photo"]]; break;
-                case 34: //Voice
+                case MessageDataTypeImage:
+                    [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Image"]]; break;
+                case MessageDataTypeVoice:
                     [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Voice"]]; break;
-                case 43: //Video
+                case MessageDataTypeVideo:
                     [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Video"]]; break;
-                case 47: //Sticker
+                case MessageDataTypeSticker:
                     [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Sticker"]]; break;
-                case 49: //Forward Link
+                case MessageDataTypeLink:
                     [msgContent appendFormat:@"<%@>", [NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.Link"]]; break;
                 default:
                     [msgContent appendString:[NSBundle.tweakBundle localizedStringForKey:@"Tweak.Message.AMessage"]]; break;
@@ -152,7 +152,7 @@ static void __attribute__((constructor)) tweak(void) {
         [((MessageService *)self) DelMsg:session msgList:@[localMessageData] isDelAll:NO isManual:YES];
         [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData];
     } else {
-        if (localMessageData.messageType == 1) {
+        if (localMessageData.messageType == MessageDataTypeText) {
             [((MessageService *)self) DelMsg:session msgList:@[localMessageData] isDelAll:NO isManual:YES];
         }
         [((MessageService *)self) AddLocalMsg:session msgData:promptMessageData];