diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92295176..e4b7ea55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.9
+
+- Fix message ui overflow
+
 ## 0.1.8
 
 - Bug fix
diff --git a/lib/src/message_input.dart b/lib/src/message_input.dart
index ee0bb635..57465c8c 100644
--- a/lib/src/message_input.dart
+++ b/lib/src/message_input.dart
@@ -502,6 +502,7 @@ class _MessageInputState extends State<MessageInput> {
           ),
         ),
         context: context,
+        isScrollControlled: true,
         builder: (_) {
           return Column(
             mainAxisSize: MainAxisSize.min,
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 5f71ca2c..95cab99d 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -422,7 +422,8 @@ class _MessageWidgetState extends State<MessageWidget>
             borderRadius: boxDecoration.borderRadius,
             child: Container(
               decoration: boxDecoration,
-              constraints: BoxConstraints.loose(Size.fromWidth(300)),
+              constraints: BoxConstraints.loose(
+                  Size.fromWidth(MediaQuery.of(context).size.width * 0.7)),
               child: Stack(
                 children: <Widget>[
                   Column(
@@ -491,7 +492,9 @@ class _MessageWidgetState extends State<MessageWidget>
         decoration:
             _buildBoxDecoration(_isLastUser || nOfAttachmentWidgets > 0),
         padding: EdgeInsets.all(10),
-        constraints: BoxConstraints.loose(Size.fromWidth(300)),
+        constraints: BoxConstraints.loose(
+          Size.fromWidth(MediaQuery.of(context).size.width * 0.7),
+        ),
         child: _buildSendingError(
           MarkdownBody(
             data: text,
@@ -602,7 +605,12 @@ class _MessageWidgetState extends State<MessageWidget>
         }
       },
       child: Container(
-        constraints: BoxConstraints.loose(Size(300, 500)),
+        constraints: BoxConstraints.loose(
+          Size(
+            MediaQuery.of(context).size.width * 0.7,
+            500,
+          ),
+        ),
         child: Padding(
           padding: const EdgeInsets.all(8.0),
           child: Column(
@@ -613,7 +621,7 @@ class _MessageWidgetState extends State<MessageWidget>
                 attachment.title,
                 overflow: TextOverflow.ellipsis,
                 style: _messageTheme.messageText.copyWith(
-                  color: Colors.blue,
+                  color: StreamChatTheme.of(context).accentColor,
                   fontWeight: FontWeight.bold,
                 ),
               ),
@@ -689,7 +697,7 @@ class _MessageWidgetState extends State<MessageWidget>
                 _isMyMessage
                     ? FlatButton(
                         child: Padding(
-                          padding: const EdgeInsets.all(28.0),
+                          padding: const EdgeInsets.all(16.0),
                           child: Text(
                             'Delete message',
                             style: theme.textTheme.headline
@@ -708,7 +716,7 @@ class _MessageWidgetState extends State<MessageWidget>
                 _isMyMessage
                     ? FlatButton(
                         child: Padding(
-                          padding: const EdgeInsets.all(28.0),
+                          padding: const EdgeInsets.all(16.0),
                           child: Text(
                             'Edit message',
                             style: theme.textTheme.headline,
@@ -727,7 +735,7 @@ class _MessageWidgetState extends State<MessageWidget>
                         !widget.isParent)
                     ? FlatButton(
                         child: Padding(
-                          padding: const EdgeInsets.all(28.0),
+                          padding: const EdgeInsets.all(16.0),
                           child: Text(
                             'Start a thread',
                             style: theme.textTheme.headline,
@@ -750,6 +758,7 @@ class _MessageWidgetState extends State<MessageWidget>
       context: context,
       elevation: 2,
       clipBehavior: Clip.hardEdge,
+      isScrollControlled: true,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.only(
           topLeft: Radius.circular(32),
diff --git a/lib/src/reaction_picker.dart b/lib/src/reaction_picker.dart
index eed494a6..221dd3d8 100644
--- a/lib/src/reaction_picker.dart
+++ b/lib/src/reaction_picker.dart
@@ -14,7 +14,7 @@ class ReactionPicker extends StatelessWidget {
     @required this.reactionToEmoji,
     @required this.message,
     @required this.channel,
-    this.size = 40,
+    this.size = 30,
   }) : super(key: key);
 
   final Map<String, String> reactionToEmoji;
diff --git a/pubspec.yaml b/pubspec.yaml
index 1156b471..18362c8f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: stream_chat_flutter
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Stream Chat official Flutter SDK. Build your own chat experience using Dart and Flutter.
-version: 0.1.8
+version: 0.1.9
 
 environment:
   sdk: ">=2.3.0 <3.0.0"
@@ -12,7 +12,7 @@ dependencies:
   photo_view: ^0.9.2
   rxdart: ^0.23.1
   flutter_widgets: ^0.1.11
-  jiffy: ^3.0.0
+  jiffy: ^3.0.1
   cached_network_image: ^2.0.0
   flutter_markdown: ^0.3.4
   url_launcher: ^5.4.2