diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php
index 0ae79345e4cdb571f572121e029e9861a18eaf14..f924f233f1431e06e0e282dfbb1f6ae3ba4646a1 100644
--- a/lib/private/Mail/EMailTemplate.php
+++ b/lib/private/Mail/EMailTemplate.php
@@ -100,7 +100,10 @@ EOF;
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="%s" alt="%s" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>
diff --git a/tests/Settings/Mailer/NewUserMailHelperTest.php b/tests/Settings/Mailer/NewUserMailHelperTest.php
index a8b67278e7734c2fbb0108b4cc1821b254daac11..cee3b15b946a221ab69f3818f181cb3f394e7be3 100644
--- a/tests/Settings/Mailer/NewUserMailHelperTest.php
+++ b/tests/Settings/Mailer/NewUserMailHelperTest.php
@@ -182,7 +182,10 @@ class NewUserMailHelperTest extends TestCase {
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>
@@ -415,7 +418,10 @@ EOF;
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>
diff --git a/tests/data/emails/new-account-email-custom.html b/tests/data/emails/new-account-email-custom.html
index a60902ae306f5db879ae947966f7bc63c7898bee..4dd95db0510ca24ec95b4845d1f209a16d86e572 100644
--- a/tests/data/emails/new-account-email-custom.html
+++ b/tests/data/emails/new-account-email-custom.html
@@ -23,7 +23,10 @@
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>
diff --git a/tests/data/emails/new-account-email-single-button.html b/tests/data/emails/new-account-email-single-button.html
index 50763efa5b5feb3a581d1d07f1df2e9bec0d28d3..128f4f30db7100a4bb42da954d85f904a42d4f1a 100644
--- a/tests/data/emails/new-account-email-single-button.html
+++ b/tests/data/emails/new-account-email-single-button.html
@@ -23,7 +23,10 @@
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>
diff --git a/tests/data/emails/new-account-email.html b/tests/data/emails/new-account-email.html
index 32568e11b66fb5df74445cc3628040b8cb027c69..273e722e05218f85ee3e7200419eee7a7db81e86 100644
--- a/tests/data/emails/new-account-email.html
+++ b/tests/data/emails/new-account-email.html
@@ -23,7 +23,10 @@
 							<tbody>
 							<tr style="padding:0;text-align:left;vertical-align:top">
 								<center data-parsed="" style="min-width:580px;width:100%">
+									<!-- convince Outlook to have a max-width of 100px -->
+									<!--[if mso]><table><tr><td width="100"><![endif]-->
 									<img class="logo float-center" src="https://example.org/img/logo-mail-header.png" alt="TestCloud" align="center" style="-ms-interpolation-mode:bicubic;Margin:0 auto;clear:both;display:block;float:none;margin:0 auto;max-height:100%;max-width:100px;outline:0;text-align:center;text-decoration:none;width:auto">
+									<!--[if mso]></td></tr></table><![endif]-->
 								</center>
 							</tr>
 							</tbody>