diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el
index 9226976c114..e70f96cb2f8 100644
--- a/lisp/mail/rmailmm.el
+++ b/lisp/mail/rmailmm.el
@@ -842,8 +842,11 @@ directly."
      ((string-match "text/" content-type)
       (setq type 'text))
      ((string-match "image/\\(.*\\)" content-type)
-      (setq type (image-supported-file-p
-		  (concat "." (match-string 1 content-type))))
+      (let ((fnext (match-string 1 content-type)))
+        ;; Ask about SVG support when Content-type is image/svg+xml.
+        (if (equal fnext "svg+xml")
+            (setq fnext "svg"))
+        (setq type (image-supported-file-p (concat "." fnext))))
       (when (and type
                  rmail-mime-show-images
 	         (not (eq rmail-mime-show-images 'button))