diff --git a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
index 53e6d541f7..df4671465e 100644
--- a/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
+++ b/src/wp-includes/js/tinymce/skins/wordpress/wp-content.css
@@ -75,8 +75,19 @@ img.emoji {
 	text-align: center;
 }
 
+img {
+	height: auto;
+	max-width: 100%;
+}
+
 .wp-caption {
-	margin: 0;
+	margin: 0; /* browser reset */
+	max-width: 100%;
+}
+
+/* iOS does not obey max-width if width is set. */
+.ios .wp-caption {
+	width: auto !important;
 }
 
 .wp-caption img {