diff --git a/lib/src/giphy_attachment.dart b/lib/src/giphy_attachment.dart
index 62de980b..28092b02 100644
--- a/lib/src/giphy_attachment.dart
+++ b/lib/src/giphy_attachment.dart
@@ -31,63 +31,65 @@ class GiphyAttachment extends StatelessWidget {
       );
     }
 
-    return Column(
-      mainAxisSize: MainAxisSize.min,
-      crossAxisAlignment: CrossAxisAlignment.stretch,
-      children: <Widget>[
-        Stack(
-          children: <Widget>[
-            GestureDetector(
-              onTap: () {
-                Navigator.push(context, MaterialPageRoute(builder: (_) {
-                  return FullScreenImage(
-                    url: attachment.imageUrl ??
-                        attachment.assetUrl ??
-                        attachment.thumbUrl,
-                  );
-                }));
-              },
-              child: CachedNetworkImage(
-                height: size?.height,
-                width: size?.width,
-                placeholder: (_, __) {
-                  return Container(
-                    width: size?.width,
-                    height: size?.height,
-                    child: Center(
-                      child: CircularProgressIndicator(),
-                    ),
-                  );
+    return Card(
+      child: Column(
+        mainAxisSize: MainAxisSize.min,
+        crossAxisAlignment: CrossAxisAlignment.stretch,
+        children: <Widget>[
+          Stack(
+            children: <Widget>[
+              GestureDetector(
+                onTap: () {
+                  Navigator.push(context, MaterialPageRoute(builder: (_) {
+                    return FullScreenImage(
+                      url: attachment.imageUrl ??
+                          attachment.assetUrl ??
+                          attachment.thumbUrl,
+                    );
+                  }));
                 },
-                imageUrl: attachment.thumbUrl ??
-                    attachment.imageUrl ??
-                    attachment.assetUrl,
-                errorWidget: (context, url, error) => AttachmentError(
+                child: CachedNetworkImage(
+                  height: size?.height,
+                  width: size?.width,
+                  placeholder: (_, __) {
+                    return Container(
+                      width: size?.width,
+                      height: size?.height,
+                      child: Center(
+                        child: CircularProgressIndicator(),
+                      ),
+                    );
+                  },
+                  imageUrl: attachment.thumbUrl ??
+                      attachment.imageUrl ??
+                      attachment.assetUrl,
+                  errorWidget: (context, url, error) => AttachmentError(
+                    attachment: attachment,
+                    size: size,
+                  ),
+                  fit: BoxFit.cover,
+                ),
+              ),
+            ],
+          ),
+          if (attachment.title != null)
+            Container(
+              alignment: Alignment.bottomCenter,
+              child: Material(
+                color: messageTheme.messageBackgroundColor,
+                child: AttachmentTitle(
+                  messageTheme: messageTheme,
                   attachment: attachment,
-                  size: size,
                 ),
-                fit: BoxFit.cover,
               ),
             ),
-          ],
-        ),
-        if (attachment.title != null)
-          Container(
-            alignment: Alignment.bottomCenter,
-            child: Material(
-              color: messageTheme.messageBackgroundColor,
-              child: AttachmentTitle(
-                messageTheme: messageTheme,
-                attachment: attachment,
-              ),
+          if (attachment.actions != null)
+            AttachmentActions(
+              attachment: attachment,
+              message: message,
             ),
-          ),
-        if (attachment.actions != null)
-          AttachmentActions(
-            attachment: attachment,
-            message: message,
-          ),
-      ],
+        ],
+      ),
     );
   }
 }