diff --git a/lib/src/date_divider.dart b/lib/src/date_divider.dart
index 970169b8..fdf73049 100644
--- a/lib/src/date_divider.dart
+++ b/lib/src/date_divider.dart
@@ -43,39 +43,36 @@ class DateDivider extends StatelessWidget {
       dayInfo = createdAt.format('dd/MM/yyyy').toUpperCase();
     }
 
-    return Padding(
-      padding: const EdgeInsets.symmetric(vertical: 12.0),
-      child: Row(
-        crossAxisAlignment: CrossAxisAlignment.center,
-        children: <Widget>[
-          divider,
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 32.0),
-            child: Text.rich(
-              TextSpan(
-                children: [
-                  TextSpan(
-                    text: dayInfo,
-                    style: TextStyle(
-                      fontWeight: FontWeight.bold,
-                    ),
+    return Row(
+      crossAxisAlignment: CrossAxisAlignment.center,
+      children: <Widget>[
+        divider,
+        Padding(
+          padding: const EdgeInsets.symmetric(horizontal: 32.0),
+          child: Text.rich(
+            TextSpan(
+              children: [
+                TextSpan(
+                  text: dayInfo,
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
                   ),
-                  TextSpan(text: ' AT'),
-                  TextSpan(text: ' $hourInfo'),
-                ],
-                style: TextStyle(
-                  fontWeight: FontWeight.normal,
                 ),
-              ),
+                TextSpan(text: ' AT'),
+                TextSpan(text: ' $hourInfo'),
+              ],
               style: TextStyle(
-                fontSize: 10,
-                color: Theme.of(context).textTheme.title.color.withOpacity(.5),
+                fontWeight: FontWeight.normal,
               ),
             ),
+            style: TextStyle(
+              fontSize: 10,
+              color: Theme.of(context).textTheme.title.color.withOpacity(.5),
+            ),
           ),
-          divider,
-        ],
-      ),
+        ),
+        divider,
+      ],
     );
   }
 }
diff --git a/lib/src/deleted_message.dart b/lib/src/deleted_message.dart
index a132f48d..93fd62ff 100644
--- a/lib/src/deleted_message.dart
+++ b/lib/src/deleted_message.dart
@@ -11,13 +11,16 @@ class DeletedMessage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Text(
-      'This message was deleted...',
-      style: messageTheme.messageText.copyWith(
-        fontStyle: FontStyle.italic,
-        color: Theme.of(context).brightness == Brightness.dark
-            ? Colors.white
-            : Colors.black,
+    return Padding(
+      padding: const EdgeInsets.symmetric(vertical: 8.0),
+      child: Text(
+        'This message was deleted...',
+        style: messageTheme.messageText.copyWith(
+          fontStyle: FontStyle.italic,
+          color: Theme.of(context).brightness == Brightness.dark
+              ? Colors.white
+              : Colors.black,
+        ),
       ),
     );
   }
diff --git a/lib/src/message_list_view.dart b/lib/src/message_list_view.dart
index da67bcc9..33652222 100644
--- a/lib/src/message_list_view.dart
+++ b/lib/src/message_list_view.dart
@@ -232,12 +232,15 @@ class _MessageListViewState extends State<MessageListView> {
                 crossAxisAlignment: CrossAxisAlignment.stretch,
                 children: <Widget>[
                   messageWidget,
-                  widget.dateDividerBuilder != null
-                      ? widget
-                          .dateDividerBuilder(nextMessage.createdAt.toLocal())
-                      : DateDivider(
-                          dateTime: nextMessage.createdAt.toLocal(),
-                        ),
+                  Padding(
+                    padding: const EdgeInsets.symmetric(vertical: 12.0),
+                    child: widget.dateDividerBuilder != null
+                        ? widget
+                            .dateDividerBuilder(nextMessage.createdAt.toLocal())
+                        : DateDivider(
+                            dateTime: nextMessage.createdAt.toLocal(),
+                          ),
+                  ),
                 ],
               );
             }
@@ -413,7 +416,7 @@ class _MessageListViewState extends State<MessageListView> {
       padding: EdgeInsets.only(
         left: 8.0,
         right: 8.0,
-        bottom: index == 0 ? 30 : (isLastUser ? 5 : 10),
+        bottom: index == 0 ? 30 : (isNextUser ? 5 : 10),
       ),
       showUsername: !isMyMessage && !isNextUser,
       showSendingIndicator: isMyMessage &&
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index 25c40cd1..8e4f85ba 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -173,7 +173,8 @@ class MessageWidget extends StatelessWidget {
                                             true &&
                                         showReactions)
                                     ? EdgeInsets.only(
-                                        top: _getReactionsTopPadding())
+                                        top: _getReactionsTopPadding(),
+                                      )
                                     : EdgeInsets.zero,
                                 child: PortalEntry(
                                   portalAnchor: Alignment(0, 1),