diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ca876f0..1fb95312 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+## 0.2.0-alpha+14
+
+Added some parameters to `MessageInput`
+- add actions parameter
+- add textEditingController parameter
+- add actionsLocation (RIGHT or LEFT) parameter
+- add attachmentThumbnailBuilders
+- add editMessageInputBuilder to customize the MessageInput while editing messages
+- expose MessageInputState
+
+Using attachmentThumbnailBuilders it's possible to render custom attachment thumbnails both for standard and custom attachment types
+Using MessageInput.of or a GlobalKey<MessageInputState> it's possible to call these methods:
+
+- `sendMessage` to send the message
+- `pickFile` to open the gallery/camera to pick a file
+- `addAttachment` to add a custom attachment to the message
+- `showAttachmentModal` to show the modal (that's the behaviour of the attachmentButton)
+
 ## 0.2.0-alpha+13
 
 - Handle channel deleted event
@@ -46,7 +64,7 @@
 
 - Minor bug fixes
 
-## 0.1.20
+## 0.1.20s
 
 - Add message configuration properties to MessageListView
 
diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index ca8deb25..b7c4ef8b 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -155,7 +155,6 @@ class _MessageListViewState extends State<MessageListView> {
       },
       child: ListView.custom(
         key: Key('messageListView'),
-        shrinkWrap: true,
         physics: widget.scrollPhysics,
         controller: _scrollController,
         reverse: true,
diff --git a/lib/src/stream_chat.dart b/lib/src/stream_chat.dart
index 75a739a6..6d52e920 100644
--- a/lib/src/stream_chat.dart
+++ b/lib/src/stream_chat.dart
@@ -201,7 +201,7 @@ class StreamChatState extends State<StreamChat> with WidgetsBindingObserver {
       if (client.showLocalNotification != null) {
         _newMessageSubscription = client
             .on(EventType.messageNew)
-            .where((e) => e.user.id != user.id)
+            .where((e) => e.user?.id != user.id)
             .listen((event) async {
           var channel = client.state.channels[event.cid];
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 2b839d1b..d563c55c 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.2.0-alpha+13
+version: 0.2.0-alpha+14
 
 environment:
   sdk: ">=2.3.0 <3.0.0"
@@ -12,13 +12,13 @@ dependencies:
   photo_view: ^0.9.2
   rxdart: ^0.24.0
   jiffy: ^3.0.1
-  cached_network_image: ^2.1.0+1
+  cached_network_image: ^2.2.0
   flutter_markdown: ^0.3.5
-  url_launcher: ^5.4.2
-  video_player: ^0.10.8+1
+  url_launcher: ^5.4.5
+  video_player: ^0.10.9+1
   chewie: ^0.9.10
-  file_picker: ^1.6.3+2
-  image_picker: ^0.6.5
+  file_picker: ^1.8.0+2
+  image_picker: ^0.6.5+3
   flutter_keyboard_visibility: ^2.0.0
   stream_chat: ^0.2.0-alpha+8
   mime: ^0.9.6+3