diff --git a/ghost/admin/app/components/modal-import-content.hbs b/ghost/admin/app/components/modal-import-content.hbs
index 3026e75f44..fac8d52b6f 100644
--- a/ghost/admin/app/components/modal-import-content.hbs
+++ b/ghost/admin/app/components/modal-import-content.hbs
@@ -1,5 +1,5 @@
 <div class="gh-content-import-wrapper">
-    {{#if (eq this.state 'INIT')}}
+    {{#if (or (eq this.state 'INIT') (eq this.state 'UPLOADING'))}}
         <header class="modal-header" data-test-modal="import-content">
             <h1>Import content</h1>
         </header>
diff --git a/ghost/core/core/server/data/importer/email-template.js b/ghost/core/core/server/data/importer/email-template.js
index 4bb71b4d78..3061b50807 100644
--- a/ghost/core/core/server/data/importer/email-template.js
+++ b/ghost/core/core/server/data/importer/email-template.js
@@ -143,22 +143,6 @@ module.exports = ({result, siteUrl, postsUrl, emailRecipient}) => `
                       </td>
                     </tr>
                     ` : ''}
-                    ${result.problems && result.problems.length > 0 ? `
-                    <tr>
-                    <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 16px;">
-                      <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 0px;">Imported content successfully, but with the following warning${result.problems.length > 1 ? 's' : ''}:</p>
-                    </td>
-                    </tr>
-                    <tr>
-                      <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 16px;">
-                        <ul style="padding-left: 2em;">
-                        ${_.map(result.problems, problem => `
-                          <li style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; line-height: 25px; margin-bottom: 4px;">${problem.message}</li>
-                        `).join('\n')}
-                        </ul>
-                      </td>
-                    </tr>
-                    ` : ''}
                     ${result.data && result.data.posts && result.data.posts.length > 0 ? `
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 12px; padding-top: 16px;">