diff --git a/Yep/Caches/ImageCache.swift b/Yep/Caches/ImageCache.swift
index ece3a223..b8e19cc6 100644
--- a/Yep/Caches/ImageCache.swift
+++ b/Yep/Caches/ImageCache.swift
@@ -96,7 +96,7 @@ class ImageCache {
     }
 
     func mapImageOfMessage(message: Message, withSize size: CGSize, tailDirection: MessageImageTailDirection, completion: (UIImage) -> ()) {
-        let imageKey = "mapImage-\(message.messageID)"
+        let imageKey = "mapImage-\(message.coordinate)"
 
         // 先看看缓存
         if let image = cache.objectForKey(imageKey) as? UIImage {
diff --git a/Yep/Services/YepService.swift b/Yep/Services/YepService.swift
index 8e8ce82e..6efb27d8 100644
--- a/Yep/Services/YepService.swift
+++ b/Yep/Services/YepService.swift
@@ -1004,15 +1004,15 @@ func sendMessageWithMediaType(mediaType: MessageMediaType, inFilePath filePath:
                 realm.commitWriteTransaction()
             }
 
-            }, completion: { messageID in
-                dispatch_async(dispatch_get_main_queue()) {
-                    realm.beginWriteTransaction()
-                    message.messageID = messageID
-                    message.sendState = MessageSendState.Successed.rawValue
-                    realm.commitWriteTransaction()
-                }
-                
-                completion(success: true)
+        }, completion: { messageID in
+            dispatch_async(dispatch_get_main_queue()) {
+                realm.beginWriteTransaction()
+                message.messageID = messageID
+                message.sendState = MessageSendState.Successed.rawValue
+                realm.commitWriteTransaction()
+            }
+
+            completion(success: true)
         })
 
     default: