diff --git a/matrixConsole/API/MediaManager.m b/matrixConsole/API/MediaManager.m
index b14f53936..60adf8fe5 100644
--- a/matrixConsole/API/MediaManager.m
+++ b/matrixConsole/API/MediaManager.m
@@ -87,6 +87,10 @@ static NSMutableDictionary* pendingMediaLoadersByURL = nil;
             CGSize imageSize = CGSizeMake(width, height);
             UIGraphicsBeginImageContext(imageSize);
             
+//            // set to the top quality
+//            CGContextRef context = UIGraphicsGetCurrentContext();
+//            CGContextSetInterpolationQuality(context, kCGInterpolationHigh);
+            
             CGRect thumbnailRect = CGRectMake(0, 0, 0, 0);
             thumbnailRect.origin = CGPointMake(0.0,0.0);
             thumbnailRect.size.width  = imageSize.width;
@@ -172,16 +176,6 @@ static NSMutableDictionary* pendingMediaLoadersByURL = nil;
     }
 }
 
-//+ (void)cancel:(id)mediaLoader {
-//    [((MediaLoader*)mediaLoader) cancel];
-//    NSString *mediaURL = ((MediaLoader*)mediaLoader).mediaURL;
-//    if (mediaURL) {
-//        [self removeMediaLoaderWithUrl:mediaURL];
-//        
-//        [[NSNotificationCenter defaultCenter] postNotificationName:kMediaDownloadDidFailNotification object:mediaURL userInfo:nil];
-//    }
-//}
-
 + (NSString*)cacheMediaData:(NSData*)mediaData forURL:(NSString *)mediaURL mimeType:(NSString *)mimeType {
     NSString* filename = [MediaManager getCacheFileNameFor:mediaURL mimeType:mimeType];
     
diff --git a/matrixConsole/View/CustomImageView.h b/matrixConsole/View/CustomImageView.h
index 295f5f043..7a080fab8 100644
--- a/matrixConsole/View/CustomImageView.h
+++ b/matrixConsole/View/CustomImageView.h
@@ -16,8 +16,8 @@
 
 #import <UIKit/UIKit.h>
 
-// Customize UIImageView in order to let UIImageView handle automatically remote url
-@interface CustomImageView : UIView<UIScrollViewDelegate>
+// Customize UIView in order to display image defined with remote url. Zooming inside the image (Stretching) is supported.
+@interface CustomImageView : UIView <UIScrollViewDelegate>
 
 typedef void (^blockCustomImageView_onClick)(CustomImageView *imageView, NSString* title);
 
diff --git a/matrixConsole/ViewController/RoomViewController.m b/matrixConsole/ViewController/RoomViewController.m
index bc5889e0d..af1087a27 100644
--- a/matrixConsole/ViewController/RoomViewController.m
+++ b/matrixConsole/ViewController/RoomViewController.m
@@ -1428,7 +1428,6 @@ NSString *const kCmdResetUserPowerLevel = @"/deop";
         // Adjust Attachment width constant
         cell.attachViewWidthConstraint.constant = contentSize.width;
     } else {
-        [cell.attachmentView setImageURL:nil withPreviewImage:nil]; // Cancel potential attachment loading
         cell.attachmentView.hidden = YES;
         cell.playIconView.hidden = YES;
         cell.messageTextView.hidden = NO;