diff --git a/Samples/outlook-spam-reporting/assets/readme/outlook-spam-post-processing-dialog.png b/Samples/outlook-spam-reporting/assets/readme/outlook-spam-post-processing-dialog.png
index 2faa774b5..70fc362eb 100644
Binary files a/Samples/outlook-spam-reporting/assets/readme/outlook-spam-post-processing-dialog.png and b/Samples/outlook-spam-reporting/assets/readme/outlook-spam-post-processing-dialog.png differ
diff --git a/Samples/outlook-spam-reporting/assets/readme/outlook-spam-processing-dialog.png b/Samples/outlook-spam-reporting/assets/readme/outlook-spam-processing-dialog.png
index 95c25c93e..fadaf39ae 100644
Binary files a/Samples/outlook-spam-reporting/assets/readme/outlook-spam-processing-dialog.png and b/Samples/outlook-spam-reporting/assets/readme/outlook-spam-processing-dialog.png differ
diff --git a/Samples/outlook-spam-reporting/manifest-localhost.xml b/Samples/outlook-spam-reporting/manifest-localhost.xml
index d8ee5afe7..476d3e809 100644
--- a/Samples/outlook-spam-reporting/manifest-localhost.xml
+++ b/Samples/outlook-spam-reporting/manifest-localhost.xml
@@ -14,8 +14,8 @@
   <DisplayName DefaultValue="Office Add-ins Outlook spam-reporting sample"/>
   <Description DefaultValue="Report spam or phishing emails using a spam-reporting add-in."/>
   <IconUrl DefaultValue="https://localhost:3000/assets/icon-64.png"/>
-  <SupportUrl DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting" />
   <HighResolutionIconUrl DefaultValue="https://localhost:3000/assets/icon-128.png"/>
+  <SupportUrl DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting" />
   <AppDomains>
     <AppDomain>https://officedev.github.io</AppDomain>
   </AppDomains>
@@ -29,7 +29,7 @@
   </Requirements>
   <FormSettings>
     <Form xsi:type="ItemRead">
-    <Host Name="Mailbox"/>
+      <DesktopSettings>
         <SourceLocation DefaultValue="https://localhost:3000/src/spamreporting.html"/>
         <RequestedHeight>250</RequestedHeight>
       </DesktopSettings>
@@ -90,6 +90,9 @@
                   </ReportingOptions>
                   <FreeTextLabel resid="FreeText.Label"/>
                   <MoreInfo>
+                    <!-- Starting in Outlook on Windows Version 2404 (Build 17526.15020), the URL specified in
+                         the MoreInfoUrl element is added after the "For more info go to:" line in the preprocessing
+                         dialog. In earlier supported versions, the aforementioned line doesn't appear in the dialog. -->
                     <MoreInfoText resid="MoreInfo.Label"/>
                     <MoreInfoUrl resid="MoreInfo.Url"/>
                   </MoreInfo>
@@ -117,8 +120,8 @@
           <bt:String id="PreProcessingDialog.Label" DefaultValue="Report Spam Message"/>
           <bt:String id="OptionsTitle.Label" DefaultValue="Why are you reporting this email?"/>
           <bt:String id="FreeText.Label" DefaultValue="Provide additional information, if any:"/>
-          <bt:String id="MoreInfo.Label" DefaultValue="To learn more about reporting unsolicited messages, see "/>
-          <bt:Url id="MoreInfo.Url" DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting"/>
+          <bt:String id="MoreInfo.Label" DefaultValue="Implement an integrated spam-reporting add-in (preview)"/>
+          <bt:String id="Option1.Label" DefaultValue="Received spam email."/>
           <bt:String id="Option2.Label" DefaultValue="Received a phishing email."/>
           <bt:String id="Option3.Label" DefaultValue="I'm not sure this is a legitimate email."/>
         </bt:ShortStrings>
diff --git a/Samples/outlook-spam-reporting/manifest.xml b/Samples/outlook-spam-reporting/manifest.xml
index 532bffd05..a271a5adf 100644
--- a/Samples/outlook-spam-reporting/manifest.xml
+++ b/Samples/outlook-spam-reporting/manifest.xml
@@ -14,8 +14,8 @@
   <DisplayName DefaultValue="Office Add-ins Outlook spam-reporting sample"/>
   <Description DefaultValue="Report spam or phishing emails using a spam-reporting add-in."/>
   <IconUrl DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/assets/icon-64.png"/>
-  <SupportUrl DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting" />
   <HighResolutionIconUrl DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/assets/icon-128.png"/>
+  <SupportUrl DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting" />
   <AppDomains>
     <AppDomain>https://officedev.github.io</AppDomain>
   </AppDomains>
@@ -29,7 +29,7 @@
   </Requirements>
   <FormSettings>
     <Form xsi:type="ItemRead">
-    <Host Name="Mailbox"/>
+      <DesktopSettings>
         <SourceLocation DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/src/spamreporting.html"/>
         <RequestedHeight>250</RequestedHeight>
       </DesktopSettings>
@@ -90,6 +90,9 @@
                   </ReportingOptions>
                   <FreeTextLabel resid="FreeText.Label"/>
                   <MoreInfo>
+                    <!-- Starting in Outlook on Windows Version 2404 (Build 17526.15020), the URL specified in
+                         the MoreInfoUrl element is added after the "For more info go to:" line in the preprocessing
+                         dialog. In earlier supported versions, the aforementioned line doesn't appear in the dialog. -->
                     <MoreInfoText resid="MoreInfo.Label"/>
                     <MoreInfoUrl resid="MoreInfo.Url"/>
                   </MoreInfo>
@@ -103,13 +106,13 @@
       </Hosts>
       <Resources>
         <bt:Images>
-          <bt:Image id="Icon.16x16" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/assets/icon-16.png"/>
-          <bt:Image id="Icon.32x32" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/assets/icon-32.png"/>
-          <bt:Image id="Icon.80x80" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/assets/icon-80.png"/>
+          <bt:Image id="Icon.16x16" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/assets/icon-16.png"/>
+          <bt:Image id="Icon.32x32" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/assets/icon-32.png"/>
+          <bt:Image id="Icon.80x80" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/assets/icon-80.png"/>
         </bt:Images>
         <bt:Urls>
-          <bt:Url id="WebViewRuntime.Url" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/src/spamreporting.html"/>
-          <bt:Url id="JSRuntime.Url" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting-sample/src/spamreporting.js"/>
+          <bt:Url id="WebViewRuntime.Url" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/src/spamreporting.html"/>
+          <bt:Url id="JSRuntime.Url" DefaultValue="https://officedev.github.io/Office-Add-in-samples/Samples/outlook-spam-reporting/src/spamreporting.js"/>
           <bt:Url id="MoreInfo.Url" DefaultValue="https://learn.microsoft.com/en-us/office/dev/add-ins/outlook/spam-reporting"/>
         </bt:Urls>
         <bt:ShortStrings>
@@ -117,8 +120,8 @@
           <bt:String id="PreProcessingDialog.Label" DefaultValue="Report Spam Message"/>
           <bt:String id="OptionsTitle.Label" DefaultValue="Why are you reporting this email?"/>
           <bt:String id="FreeText.Label" DefaultValue="Provide additional information, if any:"/>
-          <bt:String id="MoreInfo.Label" DefaultValue="To learn more about reporting unsolicited messages, see "/>
-          <bt:Url id="MoreInfo.Url" DefaultValue="https://learn.microsoft.com/office/dev/add-ins/outlook/spam-reporting"/>
+          <bt:String id="MoreInfo.Label" DefaultValue="Implement an integrated spam-reporting add-in (preview)"/>
+          <bt:String id="Option1.Label" DefaultValue="Received spam email."/>
           <bt:String id="Option2.Label" DefaultValue="Received a phishing email."/>
           <bt:String id="Option3.Label" DefaultValue="I'm not sure this is a legitimate email."/>
         </bt:ShortStrings>