diff --git a/templates/zerver/emails/email.css b/templates/zerver/emails/email.css
index dde678ff8f..95d2ca7f08 100644
--- a/templates/zerver/emails/email.css
+++ b/templates/zerver/emails/email.css
@@ -52,6 +52,12 @@ table.layout > tbody > tr > td {
     padding: 10px;
 }
 
+/* This class is used to ensure that the images' width
+   does not exceed the actual email layout width. */
+img.responsive-width {
+    max-width: 100%;
+}
+
 /* Our newsletters/marketing emails use a wider content width, to
    support more complex content with text to the side of images. */
 .container.wide-container {