Merge branch 'main' into live

Author: github-actions

docs/develop/manifest-element-ordering.md

@@ -1,7 +1,7 @@
 ---
 title: How to find the proper order of manifest elements
 description: Learn how to find the correct order in which to place child elements in a parent element.
-ms.date: 09/5/2024
+ms.date: 06/02/2025
 ms.localizationpriority: medium
 ---
 
@@ -503,6 +503,17 @@ The following sections show the manifest elements in the order in which they mus
         <Resource>
         <Scopes>
             <Scope>
+    <EquivalentAddins>
+        <EquivalentAddin>
+            <ProgId>
+            <DisplayName>
+            <FileName>
+            <Type>    
+    <ConnectedServiceControls>
+        <ConnectedServiceControlsScopes>
+            <Scope>
+    <ExtendedPermissions>
+        <ExtendedPermission>
 ```
 
 ## Content add-in element ordering within VersionOverrides

docs/includes/quickstart-troubleshooting-yo.md

@@ -1,3 +1,7 @@
 [!include[The common troubleshooting section for all quick starts](../includes/quickstart-troubleshooting-common.md)]
 
-- The automatic `npm install` step Yo Office performs may fail. If you see errors when trying to run `npm start`, navigate to the newly created project folder in a command prompt and manually run `npm install`. For more information about Yo Office, see [Create Office Add-in projects using the Yeoman Generator](../develop/yeoman-generator-overview.md).
+- The automatic `npm install` step Yo Office performs may fail. If you see errors when trying to run `npm start`, navigate to the newly created project folder in a command prompt and manually run `npm install`. For more information about Yo Office, see [Create Office Add-in projects using the Yeoman Generator](../develop/yeoman-generator-overview.md).
+- You may see warnings generated when running `npm install` for either Yeoman generator or the project. In most cases, you can safely ignore these warnings. Sometimes, dependencies become deprecated and their replacements aren't supported by other packages on which the project depends. If you would like to resolve these warnings, use the `npm-check-updates` tool.
+  - In the command prompt while in the root project directory, run `npm i -g npm-check-updates`. This installs the tool globally.
+  - Run `ncu -u`. This provides a report of all packages and to what versions they will be updated.
+  - Run `npm install` to update all the packages.

docs/outlook/faq-nested-app-auth-outlook-legacy-tokens.md

@@ -191,7 +191,7 @@ Some widely used Outlook add-in publishers have already updated their add-ins as
 - [SalesForce for Outlook](https://appsource.microsoft.com/product/office/wa104379334)
 - [LawToolBox](https://lawtoolbox.com/lawtoolbox-for-copilot/)
 - [OnePlace Solutions](https://www.oneplacesolutions.com/oneplacemail-sharepoint-app-for-outlook.html)
-- [Set-OutlookSignatures Benefactor Circle](https://explicitconsulting.at/open-source/set-outlooksignatures/)
+- [Set-OutlookSignatures Benefactor Circle](https://set-outlooksignatures.com)
 - [Wrike](https://appsource.microsoft.com/product/office/wa104381120)
 - [Zoho CRM for Email](https://appsource.microsoft.com/product/office/WA104379468)
 - [Zoho Recruit for Email](https://appsource.microsoft.com/product/office/WA200001485)

docs/outlook/insert-data-in-the-body.md

@@ -1,14 +1,74 @@
 ---
-title: Insert data in the body when composing an appointment or message in Outlook
-description: Learn how to insert data into the body of an appointment or message in an Outlook add-in.
-ms.date: 08/09/2023
+title: Get or set the body of a message or appointment in Outlook
+description: Learn how to get or insert data into the body of an appointment or message of an Outlook add-in.
+ms.date: 06/03/2025
 ms.topic: how-to
 ms.localizationpriority: medium
 ---
 
-# Insert data in the body when composing an appointment or message in Outlook
+# Get or set the body of a message or appointment in Outlook
 
-Use the asynchronous methods ([Body.getAsync](/javascript/api/outlook/office.body#outlook-office-body-getasync-member(1)), [Body.getTypeAsync](/javascript/api/outlook/office.body#outlook-office-body-gettypeasync-member(1)), [Body.prependAsync](/javascript/api/outlook/office.body#outlook-office-body-prependasync-member(1)), [Body.setAsync](/javascript/api/outlook/office.body#outlook-office-body-setasync-member(1)) and [Body.setSelectedDataAsync](/javascript/api/outlook/office.body#outlook-office-body-setselecteddataasync-member(1))) to get the body type and insert data in the body of an appointment or message being composed. These asynchronous methods are only available to compose add-ins. To use these methods, make sure you have set up the add-in manifest appropriately so that Outlook activates your add-in in compose forms, as described in [Create Outlook add-ins for compose forms](compose-scenario.md).
+Call the [Body](/javascript/api/outlook/office.body) API on a message or appointment to retrieve content, determine its format, or update content. With the available Body methods, you can customize signatures depending on mail item recipients or add disclaimers for legal purposes.
+
+Select the applicable tab to learn how to get or set the body of a mail item.
+
+# [Get body](#tab/get)
+
+You can get the body of a message or appointment in both read and compose modes. To retrieve the body of a mail item, call [Office.context.mailbox.item.body.getAsync](/javascript/api/outlook/office.body#outlook-office-body-getasync-member(1)). When you call the `getAsync` method, you must specify the format for the returned body in the `coercionType` parameter. For example, you can get the body in HTML or plain text format.
+
+The following example gets the body of an item in HTML format.
+
+```javascript
+// Get the current body of the message or appointment.
+Office.context.mailbox.item.body.getAsync(Office.CoercionType.Html, (bodyResult) => {
+  if (bodyResult.status === Office.AsyncResultStatus.Failed) {
+    console.log(`Failed to get body: ${bodyResult.error.message}`);
+    return;
+  }
+
+  const body = bodyResult.value;
+
+  // Perform additional operations here.
+});
+```
+
+## Get the body of message replies in Outlook on the web or the new Outlook on Windows
+
+In Outlook on the web and the [new Outlook on Windows](https://support.microsoft.com/office/656bb8d9-5a60-49b2-a98b-ba7822bc7627), users can organize their messages as conversations or individual messages in **Settings** > **Mail** > **Layout** > **Message organization**. This setting affects how much of a message's body is displayed to the user, particularly in conversation threads with multiple messages. Depending on the setting, the contents of the entire conversation thread or just the current message is displayed. For more information on the **Message Organization** setting, see [Change how the message list is displayed in Outlook](https://support.microsoft.com/office/57fe0cd8-e90b-4b1b-91e4-a0ba658c0042).
+
+When you call `Office.context.mailbox.item.body.getAsync` on a message reply, the entire body of a conversation thread is returned. If you want the returned body to reflect the user's **Message Organization** setting, you can specify the [bodyMode](/javascript/api/outlook/office.mailboxenums.bodymode) option in the `getAsync` call. The following table lists the portion of the body returned depending on the `bodyMode` configuration.
+
+| bodyMode configuration | Effect on body |
+| ----- | ----- |
+| `bodyMode` isn't specified in the `getAsync` call | The entire body of the conversation thread is returned. |
+| `bodyMode` is set to `Office.MailboxEnums.BodyMode.FullBody` | The entire body of the conversation thread is returned. |
+| `bodyMode` is set to `Office.MailboxEnums.BodyMode.HostConfig` | If **Message Organization** is set to **Group messages by conversation** > **All messages from the selected conversation** or **Show email grouped by conversation** > **Newest on top**/**Newest on bottom**, only the body of the current reply is returned.<br><br>If **Message Organization** is set to **Individual messages: Do not group messages** > **Only a single message** or **Show email as individual messages**, the entire body of the conversation thread is returned. |
+
+> [!NOTE]
+> The `bodyMode` option is ignored in Outlook on Windows (classic), on Mac, and on mobile devices.
+
+The following example specifies the `bodyMode` option to honor the user's message setting.
+
+```javascript
+Office.context.mailbox.item.body.getAsync(
+  Office.CoercionType.Html,
+  { bodyMode: Office.MailboxEnums.BodyMode.HostConfig },
+  (bodyResult) => {
+    if (bodyResult.status === Office.AsyncResultStatus.Failed) {
+      console.log(`Failed to get body: ${bodyResult.error.message}`);
+      return;
+    }
+
+    const body = bodyResult.value;
+
+    // Perform additional operations here.
+  }
+);
+```
+
+# [Set body](#tab/set)
+
+Use the asynchronous methods ([Body.getAsync](/javascript/api/outlook/office.body#outlook-office-body-getasync-member(1)), [Body.getTypeAsync](/javascript/api/outlook/office.body#outlook-office-body-gettypeasync-member(1)), [Body.prependAsync](/javascript/api/outlook/office.body#outlook-office-body-prependasync-member(1)), [Body.setAsync](/javascript/api/outlook/office.body#outlook-office-body-setasync-member(1)) and [Body.setSelectedDataAsync](/javascript/api/outlook/office.body#outlook-office-body-setselecteddataasync-member(1))) to get the body type then insert data in the body of an appointment or message being composed. These asynchronous methods are only available to compose add-ins. To use these methods, make sure you have set up the add-in manifest appropriately so that Outlook activates your add-in in compose forms, as described in [Create Outlook add-ins for compose forms](compose-scenario.md).
 
 In Outlook, a user can create a message in text, HTML, or Rich Text Format (RTF), and can create an appointment in HTML format. Before inserting data, you must first verify the supported item format by calling `getTypeAsync`, as you may need to take additional steps. The value that `getTypeAsync` returns depends on the original item format, as well as the support of the device operating system and application to edit in HTML format. Once you've verified the item format, set the `coercionType` parameter of `prependAsync` or `setSelectedDataAsync` accordingly to insert the data, as shown in the following table. If you don't specify an argument, `prependAsync` and `setSelectedDataAsync` assume the data to insert is in text format.
 
@@ -159,11 +219,52 @@ function prependItemBody() {
 }
 ```
 
+## Set the body of message replies in Outlook on the web or the new Outlook on Windows
+
+In Outlook on the web and the [new Outlook on Windows](https://support.microsoft.com/office/656bb8d9-5a60-49b2-a98b-ba7822bc7627), users can organize their messages as conversations or individual messages in **Settings** > **Mail** > **Layout** > **Message organization**. This setting affects how much of a message's body is displayed to the user, particularly in conversation threads with multiple messages. Depending on the setting, the contents of the entire conversation thread or just the current message is displayed. For more information on the **Message Organization** setting, see [Change how the message list is displayed in Outlook](https://support.microsoft.com/office/57fe0cd8-e90b-4b1b-91e4-a0ba658c0042).
+
+When you call `Office.context.mailbox.item.body.setAsync` on a message reply, the entire body of a conversation thread is replaced with the text you specify. If you want to honor the user's **Message Organization** setting and only replace the body of the current reply, you can specify the [bodyMode](/javascript/api/outlook/office.mailboxenums.bodymode) option in the `setAsync` call. The following table lists the `bodyMode` configurations and how each affects the message body being set.
+
+| bodyMode configuration | Effect on body |
+| ----- | ----- |
+| `bodyMode` isn't specified in the `setAsync` call | The entire body of the conversation thread is replaced. This applies even if a user's messages are organized by conversation. In this scenario, the user's setting is temporarily changed to **Individual messages: Do not group messages** > **Only a single message** or **Show email as individual messages** during the `setAsync` call. A notification is shown to the user to alert them to this change. Once the call completes, the user's setting is reinstated. |
+| `bodyMode` is set to `Office.MailboxEnums.BodyMode.FullBody` | The entire body of the conversation thread is replaced. This applies even if a user's messages are organized by conversation. In this scenario, the user's setting is temporarily changed to **Individual messages: Do not group messages** > **Only a single message** or **Show email as individual messages** during the `setAsync` call. A notification is shown to the user to alert them to this change. Once the call completes, the user's setting is reinstated. |
+| `bodyMode` is set to `Office.MailboxEnums.BodyMode.HostConfig` | If **Message Organization** is set to **Group messages by conversation** > **All messages from the selected conversation** or **Show email grouped by conversation** > **Newest on top**/**Newest on bottom**, only the body of the current reply is replaced.<br><br>If **Message Organization** is set to **Individual messages: Do not group messages** > **Only a single message** or **Show email as individual messages**, the entire body of the conversation thread is replaced. |
+
+> [!NOTE]
+> The `bodyMode` option is ignored in Outlook on Windows (classic), on Mac, and on mobile devices.
+
+The following example specifies the `bodyMode` option to honor the user's message setting.
+
+```javascript
+Office.context.mailbox.item.body.setAsync(
+  "This text replaces the body of the message.",
+  {
+    coercionType: Office.CoercionType.Html,
+    bodyMode: Office.MailboxEnums.BodyMode.HostConfig
+  },
+  (bodyResult) => {
+    if (bodyResult.status === Office.AsyncResultStatus.Failed) {
+      console.log(`Failed to set body: ${bodyResult.error.message}`);
+      return;
+    }
+
+    console.log("Successfully replaced the body of the message.");
+  }
+);
+```
+
+---
+
+## Try code samples in Script Lab
+
+Get the [Script Lab for Outlook add-in](https://appsource.microsoft.com/product/office/wa200001603) and try out the item body code samples to see the get and set APIs in action. To learn more about Script Lab, see [Explore Office JavaScript API using Script Lab](../overview/explore-with-script-lab.md).
+
 ## See also
 
 - [Create Outlook add-ins for compose forms](compose-scenario.md)
 - [Asynchronous programming in Office Add-ins](../develop/asynchronous-programming-in-office-add-ins.md)
-- [Get, set, or add recipients when composing an appointment or message in Outlook](get-set-or-add-recipients.md)  
-- [Get or set the subject when composing an appointment or message in Outlook](get-or-set-the-subject.md)  
-- [Get or set the location when composing an appointment in Outlook](get-or-set-the-location-of-an-appointment.md)
-- [Get or set the time when composing an appointment in Outlook](get-or-set-the-time-of-an-appointment.md)
+- [Prepend or append content to a message or appointment body on send](append-on-send.md)
+- [Limits for activation and JavaScript API for Outlook add-ins](limits-for-activation-and-javascript-api-for-outlook-add-ins.md)
+- [Get, set, or add recipients when composing an appointment or message in Outlook](get-set-or-add-recipients.md)
+- [Get or set the subject when composing an appointment or message in Outlook](get-or-set-the-subject.md)

docs/toc.yml

@@ -816,6 +816,8 @@ items:
       href: outlook/web-services.md
     - name: Manage notifications
       href: outlook/notifications.md
+    - name: Get or set body
+      href: outlook/insert-data-in-the-body.md
     - name: Get or set categories
       href: outlook/categories.md
     - name: Get or set internet headers
@@ -838,8 +840,6 @@ items:
         href: outlook/add-and-remove-attachments-to-an-item-in-a-compose-form.md
       - name: Get and set recipients
         href: outlook/get-set-or-add-recipients.md
-      - name: Insert data in the body
-        href: outlook/insert-data-in-the-body.md
       - name: Get and set subject
         href: outlook/get-or-set-the-subject.md
       - name: Get and set times