diff --git a/lib/src/giphy_attachment.dart b/lib/src/giphy_attachment.dart
index 02c1ca5e..f913b557 100644
--- a/lib/src/giphy_attachment.dart
+++ b/lib/src/giphy_attachment.dart
@@ -313,7 +313,7 @@ class GiphyAttachment extends StatelessWidget {
             ),
           ),
           Padding(
-            padding: const EdgeInsets.symmetric(vertical: 8.0),
+            padding: const EdgeInsets.only(top: 8.0),
             child: Row(
               children: [
                 Row(
diff --git a/lib/src/message_widget.dart b/lib/src/message_widget.dart
index d57ef0f9..e768c39d 100644
--- a/lib/src/message_widget.dart
+++ b/lib/src/message_widget.dart
@@ -293,8 +293,9 @@ class _MessageWidgetState extends State<MessageWidget> {
                                           children: <Widget>[
                                             ..._parseAttachments(context),
                                             if (widget.message.text
-                                                .trim()
-                                                .isNotEmpty)
+                                                    .trim()
+                                                    .isNotEmpty &&
+                                                !isGiphy)
                                               _buildTextBubble(context),
                                           ],
                                         ),
@@ -314,19 +315,6 @@ class _MessageWidgetState extends State<MessageWidget> {
                                               .reactionsBorderColor,
                                         ),
                                       ),
-                                    )
-                                  : Column(
-                                      crossAxisAlignment:
-                                          CrossAxisAlignment.start,
-                                      mainAxisSize: MainAxisSize.min,
-                                      children: <Widget>[
-                                        ..._parseAttachments(context),
-                                        if (widget.message.text
-                                                .trim()
-                                                .isNotEmpty &&
-                                            !isGiphy)
-                                          _buildTextBubble(context),
-                                      ],
                                     ),
                                   ),
                               ],