diff --git a/Classes/BITFeedbackListViewController.m b/Classes/BITFeedbackListViewController.m
index 710ca82777..25bcb75760 100644
--- a/Classes/BITFeedbackListViewController.m
+++ b/Classes/BITFeedbackListViewController.m
@@ -652,6 +652,7 @@
       [attachment replaceData:responseData];
       [[NSNotificationCenter defaultCenter] postNotificationName:kBITFeedbackUpdateAttachmentThumbnail object:attachment];
       [[BITHockeyManager sharedHockeyManager].feedbackManager saveMessages];
+      [self.tableView reloadData];
     });
   }
 }
diff --git a/Classes/BITFeedbackManager.m b/Classes/BITFeedbackManager.m
index 8343d4b2f9..b822f8a84f 100644
--- a/Classes/BITFeedbackManager.m
+++ b/Classes/BITFeedbackManager.m
@@ -780,6 +780,7 @@ typedef void (^BITLatestImageFetchCompletionBlock)(UIImage *_Nonnull latestImage
                 int attachmentIndex = 0;
                 for (BITFeedbackMessageAttachment *attachment in matchingSendInProgressOrInConflictMessage.attachments) {
                   attachment.identifier = feedbackAttachments[attachmentIndex][@"id"];
+                  attachment.sourceURL = feedbackAttachments[attachmentIndex][@"url"];
                   attachmentIndex++;
                 }
               }
diff --git a/Classes/BITFeedbackMessageAttachment.m b/Classes/BITFeedbackMessageAttachment.m
index 05d4f3ac58..8696dace86 100644
--- a/Classes/BITFeedbackMessageAttachment.m
+++ b/Classes/BITFeedbackMessageAttachment.m
@@ -209,6 +209,13 @@
 
 #pragma mark - Persistence Helpers
 
+- (void)setFilename:(NSString *)filename {
+  if (filename) {
+    filename = [_cachePath stringByAppendingPathComponent:[filename lastPathComponent]];
+  }
+  _filename = filename;
+}
+
 - (NSString *)possibleFilename {
   if (_tempFilename) {
     return _tempFilename;