diff --git a/Signal/src/environment/PreferencesUtil.m b/Signal/src/environment/PreferencesUtil.m
index 49a1ef7be..3ccd0d3b9 100644
--- a/Signal/src/environment/PreferencesUtil.m
+++ b/Signal/src/environment/PreferencesUtil.m
@@ -135,7 +135,7 @@
     if (preference) {
         return [preference unsignedIntegerValue];
     } else {
-        return TSImageQualityUncropped;
+        return TSImageQualityMedium;
     }
 }
 
diff --git a/Signal/src/textsecure/Messages/TSMessage.h b/Signal/src/textsecure/Messages/TSMessage.h
index 100be43e1..375359e93 100644
--- a/Signal/src/textsecure/Messages/TSMessage.h
+++ b/Signal/src/textsecure/Messages/TSMessage.h
@@ -23,7 +23,7 @@ typedef NS_ENUM(NSInteger, TSGroupMetaMessage){
 @interface TSMessage : TSInteraction
 
 @property (nonatomic, readonly) NSMutableArray  *attachments;
-@property (nonatomic, readonly) NSString        *body;
+@property (nonatomic) NSString        *body;
 @property (nonatomic) TSGroupMetaMessage groupMetaMessage;
 
 - (instancetype)initWithTimestamp:(uint64_t)timestamp
diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.h b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.h
index 38212e8c4..7fe6c27b6 100644
--- a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.h
+++ b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.h
@@ -12,7 +12,6 @@
 @interface TSMessagesManager (attachments)
 
 - (void)handleReceivedMediaMessage:(IncomingPushMessageSignal*)message withContent:(PushMessageContent*)content;
-- (void)retrieveAttachment:(TSAttachment*)attachment;
 - (void)sendAttachment:(NSData*)attachmentData contentType:(NSString*)contentType inMessage:(TSOutgoingMessage*)outgoingMessage thread:(TSThread*)thread;
 
 @end
diff --git a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m
index 000206c84..c17f70fe1 100644
--- a/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m
+++ b/Signal/src/textsecure/Messages/TSMessagesManager+attachments.m
@@ -52,7 +52,7 @@ dispatch_queue_t attachmentsQueue() {
                 [attachmentPointer saveWithTransaction:transaction];
                 
                 dispatch_async(attachmentsQueue(), ^{
-                    [self retrieveAttachment:attachmentPointer];
+                    [self retrieveAttachment:attachmentPointer messageId:[TSInteraction stringFromTimeStamp:message.timestamp]];
                 });
                 
                 [retrievedAttachments addObject:attachmentPointer.uniqueId];
@@ -93,6 +93,7 @@ dispatch_queue_t attachmentsQueue() {
                         [result.pointer saveWithTransaction:transaction];
                     }];
                     
+                    outgoingMessage.body = nil;
                     [outgoingMessage.attachments addObject:attachementId];
                     
                     [self sendMessage:outgoingMessage inThread:thread];
@@ -113,28 +114,27 @@ dispatch_queue_t attachmentsQueue() {
     [self sendAttachment:attachmentData contentType:contentType inMessage:message thread:thread];
 }
 
-- (void)retrieveAttachment:(TSAttachmentPointer*)attachment {
+- (void)retrieveAttachment:(TSAttachmentPointer*)attachment messageId:(NSString*)messageId {
     
     TSAttachmentRequest *attachmentRequest = [[TSAttachmentRequest alloc] initWithId:[attachment identifier]
                                                                                relay:attachment.relay];
     
     [[TSNetworkManager sharedManager] queueAuthenticatedRequest:attachmentRequest success:^(NSURLSessionDataTask *task, id responseObject) {
         if ([responseObject isKindOfClass:[NSDictionary class]]) {
-            NSString *location = [(NSDictionary*)responseObject objectForKey:@"location"];
-            NSData *data = [self downloadFromLocation:location];
-            if (data) {
-                dispatch_async(attachmentsQueue(), ^{
-                    [self decryptedAndSaveAttachment:attachment data:data];
-                });
-            }
-            
+            dispatch_async(attachmentsQueue(), ^{
+                NSString *location = [(NSDictionary*)responseObject objectForKey:@"location"];
+                NSData *data = [self downloadFromLocation:location];
+                if (data) {
+                    [self decryptedAndSaveAttachment:attachment data:data messageId:messageId];
+                }
+            });
         }
     } failure:^(NSURLSessionDataTask *task, NSError *error) {
         DDLogError(@"Failed task %@ error: %@", task.description, error.description);
     }];
 }
 
-- (void)decryptedAndSaveAttachment:(TSAttachmentPointer*)attachment data:(NSData*)cipherText {
+- (void)decryptedAndSaveAttachment:(TSAttachmentPointer*)attachment data:(NSData*)cipherText messageId:(NSString*)messageId {
     NSData *plaintext = [Cryptography decryptAttachment:cipherText withKey:attachment.encryptionKey];
     
     if (!plaintext) {
@@ -145,12 +145,16 @@ dispatch_queue_t attachmentsQueue() {
                                                                         contentType:attachment.contentType];
         [self.dbConnection readWriteWithBlock:^(YapDatabaseReadWriteTransaction *transaction) {
             [stream saveWithTransaction:transaction];
+            
             if([attachment.avatarOfGroupId length]!=0) {
                 GroupModel *emptyModelToFillOutId = [[GroupModel alloc] initWithTitle:nil memberIds:nil image:nil groupId:attachment.avatarOfGroupId]; // TODO refactor the TSGroupThread to just take in an ID (as it is all that it uses). Should not take in more than it uses
                 TSGroupThread* gThread = [TSGroupThread getOrCreateThreadWithGroupModel:emptyModelToFillOutId transaction:transaction];
                 gThread.groupModel.groupImage=[stream image];
                 [gThread saveWithTransaction:transaction];
-                
+            } else {
+                // Causing message to be reloaded in view.
+                TSMessage *message = [TSMessage fetchObjectWithUniqueID:messageId transaction:transaction];
+                [message saveWithTransaction:transaction];
             }
         }];
     }
@@ -160,12 +164,13 @@ dispatch_queue_t attachmentsQueue() {
     __block NSData *data;
     
     AFHTTPRequestOperationManager *manager = [AFHTTPRequestOperationManager manager];
-    manager.completionQueue    = attachmentsQueue();
     manager.requestSerializer  = [AFHTTPRequestSerializer serializer];
     [manager.requestSerializer setValue:@"application/octet-stream" forHTTPHeaderField:@"Content-Type"];
-    
     manager.responseSerializer = [AFHTTPResponseSerializer serializer];
+    manager.completionQueue    = dispatch_get_main_queue();
+
     dispatch_semaphore_t sema = dispatch_semaphore_create(0);
+    
     [manager GET:location parameters:nil success:^(AFHTTPRequestOperation *operation, id responseObject) {
         data = responseObject;
         dispatch_semaphore_signal(sema);
@@ -173,6 +178,7 @@ dispatch_queue_t attachmentsQueue() {
         DDLogError(@"Failed to retreive attachment with error: %@", error.description);
         dispatch_semaphore_signal(sema);
     }];
+    
     dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);
     
     return data;
diff --git a/Signal/src/view controllers/MessagesViewController.m b/Signal/src/view controllers/MessagesViewController.m
index 0065ec057..928b91d7f 100644
--- a/Signal/src/view controllers/MessagesViewController.m	
+++ b/Signal/src/view controllers/MessagesViewController.m	
@@ -913,7 +913,7 @@ typedef enum : NSUInteger {
                                                                          forNotifications:notifications
                                                                              withMappings:self.messageMappings];
     
-    __block BOOL containsInsertion = NO;
+    __block BOOL scrollToBottom = NO;
     
     if (!messageRowChanges) {
         return;
@@ -937,7 +937,7 @@ typedef enum : NSUInteger {
                     TSInteraction * interaction = [self interactionAtIndexPath:rowChange.newIndexPath];
                     [[TSAdapterCacheManager sharedManager] cacheAdapter:[TSMessageAdapter messageViewDataWithInteraction:interaction inThread:self.thread] forInteractionId:interaction.uniqueId];
                     [self.collectionView insertItemsAtIndexPaths:@[ rowChange.newIndexPath ]];
-                    containsInsertion = YES;
+                    scrollToBottom = YES;
                     break;
                 }
                 case YapDatabaseViewChangeMove :
@@ -960,6 +960,7 @@ typedef enum : NSUInteger {
                     }
                     
                     [self.collectionView reloadItemsAtIndexPaths:rowsToUpdate];
+                    scrollToBottom = YES;
                     break;
                 }
             }
@@ -969,7 +970,7 @@ typedef enum : NSUInteger {
             [self.collectionView.collectionViewLayout invalidateLayoutWithContext:[JSQMessagesCollectionViewFlowLayoutInvalidationContext context]];
             [self.collectionView reloadData];
         }
-        if (containsInsertion) {
+        if (scrollToBottom) {
             [self scrollToBottomAnimated:YES];
         }
     }];