diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e1bc71d..d82d87ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Ability to create single-line or multi-line custom fields. (thanks to [@artlepool](https://github.com/artlepool))
 
 ### Misc
+- Improve performance: Show cropped images in timelines.
 - Lots of small and not so small bugfixes.
 
 
diff --git a/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment-image.jade b/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment-image.jade
index 6a5c2c16..d82cc411 100644
--- a/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment-image.jade
+++ b/app/modules/user-timeline/user-timeline-attachment/user-timeline-attachment-image.jade
@@ -2,4 +2,4 @@
 div.activity-image-attachment
     blockquote
         a(href="{{::attachment.url}}", title="See {{::attachment.filename}}", target="_blank")
-            img(ng-src="{{::attachment.url}}", alt="{{::attachment.filename}}")
+            img(ng-src="{{::attachment.thumb_url || attachment.url}}", alt="{{::attachment.filename}}")