diff --git a/lib/widgets/event_content/image_bubble.dart b/lib/widgets/event_content/image_bubble.dart
index 821657da..5c47fe4c 100644
--- a/lib/widgets/event_content/image_bubble.dart
+++ b/lib/widgets/event_content/image_bubble.dart
@@ -21,6 +21,8 @@ class ImageBubble extends StatefulWidget {
   final Color backgroundColor;
   final double radius;
   final bool thumbnailOnly;
+  final double width;
+  final double height;
   final void Function() onLoaded;
 
   const ImageBubble(
@@ -32,6 +34,8 @@ class ImageBubble extends StatefulWidget {
     this.radius = 10.0,
     this.thumbnailOnly = true,
     this.onLoaded,
+    this.width = 400,
+    this.height = 300,
     Key key,
   }) : super(key: key);
 
@@ -361,8 +365,8 @@ class _ImageBubbleState extends State<ImageBubble> {
             duration: Duration(milliseconds: 1000),
             child: Container(
               key: ValueKey(key),
-              height: widget.maxSize ? 300 : null,
-              width: widget.maxSize ? 400 : null,
+              height: widget.maxSize ? widget.height : null,
+              width: widget.maxSize ? widget.width : null,
               child: content,
             ),
           ),
diff --git a/lib/widgets/event_content/message_content.dart b/lib/widgets/event_content/message_content.dart
index 6833c542..39279274 100644
--- a/lib/widgets/event_content/message_content.dart
+++ b/lib/widgets/event_content/message_content.dart
@@ -78,7 +78,31 @@ class MessageContent extends StatelessWidget {
           case MessageTypes.Image:
           case MessageTypes.Sticker:
             if (event.showThumbnail) {
-              return ImageBubble(event);
+              // normal images should have a ratio of 4:3
+              var ratio = 4.0 / 3.0;
+              if (event.messageType == MessageTypes.Sticker) {
+                // stickers should default to a ratio of 1:1
+                ratio = 1.0;
+                // if a width and a height is specified for stickers, use those!
+                if (event.infoMap['w'] is int && event.infoMap['h'] is int) {
+                  ratio = event.infoMap['w'] / event.infoMap['h'];
+                  // make sure the ratio is within 0.9 - 2.0
+                  if (ratio > 2.0) {
+                    ratio = 2.0;
+                  }
+                  if (ratio < 0.9) {
+                    ratio = 0.9;
+                  }
+                }
+              }
+              return ImageBubble(
+                event,
+                width: 400,
+                height: 400 / ratio,
+                fit: event.messageType == MessageTypes.Sticker && ratio < 1.0
+                    ? BoxFit.contain
+                    : BoxFit.cover,
+              );
             }
             return MessageDownloadContent(event, textColor);
           case MessageTypes.Audio: