diff --git a/help/l10n/en_US/bk01-toc.html b/help/l10n/en_US/bk01-toc.html
index 89448a9e9b7789bc1ed20df7b45b001d6fe806b7..dd1e19a25fadb7c12951ad639f9f0bc15b089fe8 100644
--- a/help/l10n/en_US/bk01-toc.html
+++ b/help/l10n/en_US/bk01-toc.html
@@ -61,7 +61,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.firststeps.keyboard.examples.html">Use cases</a></li>
 </ul>
 </li>
-<li class="sect1"><a href="ox.appsuite.user.sect.firststeps.mobile.html">Usage on Mobile Devices</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a></li>
 </ul>
 </li>
 <li class="chapter">
@@ -285,13 +285,13 @@
 <li class="sect1 cap-contacts">
 <a href="ox.appsuite.user.sect.contacts.view.html">Displaying Contacts</a><ul>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></li>
-<li class="sect2 cap-enterpriseaddressbook"><a href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></li>
+<li class="sect2 feat-io-ox-core-enterprisePicker"><a href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></li>
 <li class="sect2 cap-webmail cap-calendar cap-tasks"><a href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a></li>
 </ul>
 </li>
 <li class="sect1 cap-contacts"><a href="ox.appsuite.user.sect.contacts.attachments.html">Viewing or Saving Contact Attachments</a></li>
 <li class="sect1 cap-contacts"><a href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></li>
-<li class="sect1 cap-enterpriseaddressbook"><a href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></li>
+<li class="sect1 feat-io-ox-core-enterprisePicker"><a href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></li>
 <li class="sect1 cap-contacts">
 <a href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a><ul>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></li>
@@ -309,7 +309,7 @@
 <li class="sect1 cap-contacts"><a href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></li>
 <li class="sect1 cap-contacts cap-switchboard"><a href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></li>
 <li class="sect1 cap-contacts">
-<a href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a><ul>
+<a href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a><ul>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">Refreshing and managing address book subscriptions</a></li>
@@ -484,14 +484,14 @@
 </li>
 <li class="chapter">
 <a href="ox.appsuite.user.chap.security.html">Data Security</a><ul>
-<li class="sect1"><a href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></li>
 <li class="sect1 cap-multifactor">
 <a href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a><ul>
-<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></li>
+<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></li>
diff --git a/help/l10n/en_US/index.html b/help/l10n/en_US/index.html
index 0ac29a7fdd4d0437720f0e9a2fd8c0e2587bb5c3..cee66b495cfbd43e4947d9eb7feae1d39c7a16bd 100644
--- a/help/l10n/en_US/index.html
+++ b/help/l10n/en_US/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Legal Notice</a></div>
-<div><p class="pubdate">Thursday, April 06, 2023 Version 8.12.0 </p></div>
+<div><p class="pubdate">Wednesday, April 26, 2023 Version 8.13.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -97,12 +97,12 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.html">The <span class="phrase">Address Book</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.html">Adding Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">Adding Distribution Lists</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">Refreshing and managing address book subscriptions</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p></li>
@@ -148,7 +148,7 @@
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.security.html"><i>Data Security</i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
index 849a2fca79d5f3a13de08ca34c9b0b8561d84ad1..622090a965ceb8d45cec281621ce9e18588c4579 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
@@ -47,7 +47,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.html">Adding Distribution Lists</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.8.6.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.firststeps.html b/help/l10n/en_US/ox.appsuite.user.chap.firststeps.html
index 082f29a32d24832de6020bb3f27516d4f7757aca..a0254d6881f62809f5238858872d11fc72422bc8 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.firststeps.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.firststeps.html
@@ -41,7 +41,7 @@
 <p> You can also have a look at those topics: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.keyboard.html">Keyboard Input</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.mobile.html">Usage on Mobile Devices</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a></p></li>
 </ul>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.security.html b/help/l10n/en_US/ox.appsuite.user.chap.security.html
index 5ab38ddfa6ad9fd6161a0743036230f418a92ed7..85e57a3912c75277ab44d1d634f447c6d462c0c3 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.security.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
-<link rel="next" href="ox.appsuite.user.sect.security.autologout.html" title="Signing Out Automatically">
+<link rel="next" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -40,7 +40,7 @@
 <p id="ox.appsuite.user.concept.security">Topics: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
 <p role="presentation">You can define whether you are automatically signed out.</p>
 </li>
 <li class="listitem">
diff --git a/help/l10n/en_US/ox.appsuite.user.index.html b/help/l10n/en_US/ox.appsuite.user.index.html
index 544b17946f9be0d2b3d3f4f2f82d0d9f928619b6..9765eab403ad33a8b302a974354ecc1a6d6f4b4f 100644
--- a/help/l10n/en_US/ox.appsuite.user.index.html
+++ b/help/l10n/en_US/ox.appsuite.user.index.html
@@ -58,7 +58,7 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">add attachments</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">add attachments</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">Add storage accounts, <a class="indexterm" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a>
@@ -113,20 +113,20 @@
 <dt class="cap-contacts">subscribe to shared address books, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
 </dt>
 </dl></dd>
-<dt class="cap-enterpriseaddressbook">Address directory</dt>
+<dt class="feat-io-ox-core-enterprisePicker">Address directory</dt>
 <dd><dl>
-<dt class="cap-enterpriseaddressbook">automatically add contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">automatically add resources, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add resources, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">display contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a>
+<dt class="feat-io-ox-core-enterprisePicker">display contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a>
 </dt>
 </dl></dd>
 <dt class="cap-webmail">Addresses</dt>
 <dd><dl>
 <dt class="cap-contacts">automatically add from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
 <dt class="cap-webmail">collect from emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a>
 </dt>
@@ -155,22 +155,13 @@
 <dt class="">app launcher, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.applauncher.html">App Launcher</a>
 </dt>
 <dt class="feat-io-ox-core-countdown">appointments</dt>
-<dd><dl><dt class="feat-io-ox-core-countdown">Use countdown, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Use countdown for appointments</a>
-</dt></dl></dd>
-<dt class="cap-calendar">Appointments</dt>
 <dd><dl>
 <dt class="cap-calendar">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">add attachments</a>
 </dt>
-<dt class="cap-calendar">add participants or resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a>
-</dt>
-<dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
-</dt>
 <dt class="cap-calendar">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a>
 </dt>
 <dt class="cap-calendar">change reminder, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a>
 </dt>
-<dt class="cap-calendar">change the organizer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a>
-</dt>
 <dt class="cap-calendar">change time or duration, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
 <dt class="cap-calendar">Changing the appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a>
@@ -179,16 +170,12 @@
 </dt>
 <dt class="cap-calendar">create, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
 </dt>
-<dt class="cap-calendar">create a follow-up appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a>
-</dt>
 <dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">create appointments by using the resource calendar</a>
 </dt>
 <dt class="cap-calendar">create from iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a>
 </dt>
 <dt class="cap-deputy">create, edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a>
 </dt>
-<dt class="cap-calendar">delete, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a>
-</dt>
 <dt class="cap-calendar">display in calendar view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a>
 </dt>
 <dt class="cap-calendar">display in list view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
@@ -209,26 +196,45 @@
 </dt>
 <dt class="cap-calendar">Inviting participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a>
 </dt>
-<dt class="cap-calendar">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
-</dt>
-<dt class="cap-calendar">manage favorite timezones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite timezones</a>
+<dt class="cap-calendar">Manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
 <dt class="cap-calendar">move to another calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a>
 </dt>
-<dt class="cap-calendar">print, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a>
-</dt>
 <dt class="cap-calendar">reschedule to another day, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
 <dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a>
 </dt>
-<dt class="cap-calendar">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
-</dt>
 <dt class="cap-calendar">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a>
 </dt>
-<dt class="cap-calendar cap-switchboard">schedule audio/video conference, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
-</dt>
 <dt class="cap-calendar">search, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
 </dt>
+<dt class="feat-io-ox-core-countdown">Use countdown, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Use countdown for appointments</a>
+</dt>
+<dt class="cap-calendar">view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>
+</dt>
+<dt class="cap-calendar">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a>
+</dt>
+</dl></dd>
+<dt class="cap-calendar">Appointments</dt>
+<dd><dl>
+<dt class="cap-calendar">add participants or resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a>
+</dt>
+<dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
+</dt>
+<dt class="cap-calendar">change the organizer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a>
+</dt>
+<dt class="cap-calendar">create a follow-up appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a>
+</dt>
+<dt class="cap-calendar">delete, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a>
+</dt>
+<dt class="cap-calendar">manage favorite timezones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite timezones</a>
+</dt>
+<dt class="cap-calendar">print, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a>
+</dt>
+<dt class="cap-calendar">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
+</dt>
+<dt class="cap-calendar cap-switchboard">schedule audio/video conference, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
+</dt>
 <dt class="cap-calendar">set an appointment's display, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.display.html">Setting an appointment's display</a>
 </dt>
 <dt class="cap-calendar">set recurring appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.serial.html">Setting recurring appointments</a>
@@ -241,10 +247,6 @@
 </dt>
 <dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
-<dt class="cap-calendar">view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>
-</dt>
-<dt class="cap-calendar">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a>
-</dt>
 </dl></dd>
 <dt class="cap-guard">Autocrypt</dt>
 <dd><dl>
@@ -310,8 +312,6 @@
 </dt>
 <dt class="cap-calendar">components, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">The Calendar Components</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">create appointments by using the resource calendar</a>
-</dt>
 <dt class="cap-calendar">Date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
 </dt>
 <dt class="cap-calendar">detail view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The Calendar detail view</a>
@@ -320,12 +320,8 @@
 </dt>
 <dt class="cap-calendar">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The Calendar folder view</a>
 </dt>
-<dt class="cap-calendar">Import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
-</dt>
 <dt class="cap-calendar">list view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">The Calendar list view</a>
 </dt>
-<dt class="cap-calendar">mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
-</dt>
 <dt class="cap-calendar">Mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
 </dt>
 <dt class="cap-calendar">New appointment button, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">The New appointment button</a>
@@ -336,16 +332,29 @@
 </dt>
 <dt class="cap-calendar">settings, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">subscribe to iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a>
+<dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
 </dt>
 <dt class="cap-calendar">subscribe to public and shared calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a>
 </dt>
-<dt class="cap-calendar_google">Subscribing to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
-</dt>
 <dt class="cap-calendar">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.settingsmenu.html">The Settings menu</a>
 </dt>
 <dt class="cap-calendar">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The Calendar toolbar</a>
 </dt>
+</dl></dd>
+<dt class="cap-calendar">calendar</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">create appointments by using the resource calendar</a>
+</dt>
+<dt class="cap-calendar">Date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
+</dt>
+<dt class="cap-calendar">Import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+</dt>
+<dt class="cap-calendar">mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
+</dt>
+<dt class="cap-calendar">subscribe to iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a>
+</dt>
+<dt class="cap-calendar_google">Subscribing to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
+</dt>
 <dt class="cap-calendar">use calendar colors, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">use resource calendars</a>
@@ -353,9 +362,6 @@
 <dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">calendar</dt>
-<dd><dl><dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
-</dt></dl></dd>
 <dt class="cap-calendar">Calendar settings</dt>
 <dd><dl>
 <dt class="cap-calendar">automatically apply appointment changes received via email to your calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
@@ -409,13 +415,13 @@
 </dt></dl></dd>
 <dt class="cap-contacts">Contacts</dt>
 <dd><dl>
-<dt class="cap-contacts">add address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a>
+<dt class="cap-contacts">add address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a>
 </dt>
 <dt class="cap-contacts">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">add attachments</a>
 </dt>
 <dt class="cap-contacts">add from vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.vcardattachment.html">Adding a contact from a vCard attachment</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">automatically add email address from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add email address from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
 <dt class="cap-contacts">automatically add email address from an address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
 </dt>
@@ -437,7 +443,7 @@
 </dt>
 <dt class="cap-contacts">display, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.html">Displaying Contacts</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">display in the address list, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a>
+<dt class="feat-io-ox-core-enterprisePicker">display in the address list, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a>
 </dt>
 <dt class="cap-webmail cap-calendar cap-tasks">display the halo view, <a class="indexterm" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a>
 </dt>
@@ -518,11 +524,11 @@
 <dd><dl>
 <dt class="">account, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Viewing, editing, deleting accounts</a>
 </dt>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Deleting contacts</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a>
 </dt>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or Drive folders</a>
 </dt>
@@ -562,9 +568,7 @@
 </dt>
 <dt class="cap-calendar">appointment attachment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a>
 </dt>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>
-</dt>
-<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
 </dt>
 <dt class="cap-contacts">contact attachment, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">Viewing or Saving Contact Attachments</a>
 </dt>
@@ -705,7 +709,7 @@
 <dd><dl>
 <dt class="">account, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Viewing, editing, deleting accounts</a>
 </dt>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a>
 </dt>
@@ -725,69 +729,6 @@
 <dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
 </dt>
 <dd><dl>
-<dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
-</dt>
-<dt class="cap-webmail">components, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">The Email Components</a>
-</dt>
-<dt class="cap-guard">delete Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-<dt class="cap-webmail">detail view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">The Email detail view</a>
-</dt>
-<dt class="cap-webmail">disable or enable functional email accounts, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a>
-</dt>
-<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
-</dt>
-<dt class="cap-webmail">editing window, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">The Email editing window</a>
-</dt>
-<dt class="cap-guard">encrypt incoming emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming emails by using a filter rule</a>
-</dt>
-<dt class="">externally linked images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>
-</dt>
-<dt class="cap-webmail">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">The Email folder view</a>
-</dt>
-<dt class="cap-guard">import Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
-</dt>
-<dt class="cap-webmail">list view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The Email list view</a>
-</dt>
-<dt class="cap-webmail">New email button, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a>
-</dt>
-<dt class="cap-webmail">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">The Email pop-up</a>
-</dt>
-<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
-</dt>
-<dt class="cap-guard">read encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted emails</a>
-</dt>
-<dt class="cap-webmail">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
-</dt>
-<dt class="cap-guard">send encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a>
-</dt>
-<dt class="cap-webmail">settings, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
-<dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
-</dt>
-<dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
-</dt>
-<dt class="cap-webmail">tabs bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The Email tabs bar</a>
-</dt>
-<dt class="cap-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The Settings menu</a>
-</dt>
-<dt class="cap-webmail">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">The Email toolbar</a>
-</dt>
-<dt class="cap-guard">transfer Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferring Autocrypt keys to other clients</a>
-</dt>
-<dt class="cap-webmail">use allowlists, <a class="indexterm" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a>
-</dt>
-<dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
-</dt>
-<dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-<dt class="cap-webmail">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
-</dt>
-</dl></dd>
-<dt class="cap-webmail">email</dt>
-<dd><dl>
 <dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
 <dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a>
@@ -802,35 +743,59 @@
 </dt>
 <dt class="cap-contacts">automatically add from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
 <dt class="cap-webmail">automatically forward, <a class="indexterm" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a>
 </dt>
+<dt class="cap-webmail cap-switchboard">call the sender or another recipient, <a class="indexterm" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a>
+</dt>
 <dt class="cap-webmail">categorize, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a>
 </dt>
 <dt class="cap-webmail">clean up folders, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a>
 </dt>
 <dt class="cap-webmail">collect addresses, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a>
 </dt>
+<dt class="cap-webmail">components, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.html">The Email Components</a>
+</dt>
 <dt class="cap-webmail">copy, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a>
 </dt>
 <dt class="cap-tasks">create reminder, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a>
 </dt>
 <dt class="cap-webmail">delete, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a>
 </dt>
+<dt class="cap-guard">delete Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
+</dt>
+<dt class="cap-webmail">detail view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">The Email detail view</a>
+</dt>
+<dt class="cap-webmail">disable or enable functional email accounts, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a>
+</dt>
 <dt class="cap-webmail">display, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a>
 </dt>
+<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
+</dt>
 <dt class="cap-deputy">edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
 </dt>
+<dt class="cap-webmail">editing window, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">The Email editing window</a>
+</dt>
+<dt class="cap-guard">encrypt incoming emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming emails by using a filter rule</a>
+</dt>
+<dt class="">external images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>
+</dt>
 <dt class="cap-webmail">filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a>
 </dt>
+<dt class="cap-webmail">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">The Email folder view</a>
+</dt>
 <dt class="cap-webmail">forward, <a class="indexterm" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a>
 </dt>
+<dt class="cap-guard">import Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a>
+</dt>
 <dt class="cap-webmail">import from EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
 </dt>
 <dt class="cap-webmail">Inbox tabs, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Working with inbox tabs</a>
 </dt>
-<dt class="cap-webmail">Manage, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
+<dt class="cap-webmail">list view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The Email list view</a>
+</dt>
+<dt class="cap-webmail">manage, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
 </dt>
 <dt class="cap-webmail">mark as read, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a>
 </dt>
@@ -842,12 +807,22 @@
 </dt>
 <dt class="cap-webmail">move, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a>
 </dt>
+<dt class="cap-webmail">New email button, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a>
+</dt>
 <dt class="cap-webmail">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
+<dt class="cap-webmail">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">The Email pop-up</a>
+</dt>
+<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
+</dt>
+<dt class="cap-guard">read encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted emails</a>
+</dt>
 <dt class="cap-webmail">reply, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a>
 </dt>
 <dt class="cap-webmail">save as EML, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a>
 </dt>
+<dt class="cap-webmail">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
+</dt>
 <dt class="cap-webmail">search, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a>
 </dt>
 <dt class="cap-webmail">select a sender address, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a>
@@ -858,17 +833,44 @@
 </dt>
 <dt class="cap-deputy">send as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
 </dt>
+<dt class="cap-guard">send encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a>
+</dt>
 <dt class="cap-webmail">send from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a>
 </dt>
 <dt class="cap-calendar">send to appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a>
 </dt>
 <dt class="cap-infostore">Sending attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a>
 </dt>
+<dt class="cap-webmail">settings, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
+</dt>
+<dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
+</dt>
+<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
+</dt>
+<dt class="cap-webmail">tabs bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The Email tabs bar</a>
+</dt>
+<dt class="cap-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The Settings menu</a>
+</dt>
+<dt class="cap-webmail">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">The Email toolbar</a>
+</dt>
+<dt class="cap-guard">transfer Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferring Autocrypt keys to other clients</a>
+</dt>
 <dt class="cap-webmail">Unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
 </dt>
 <dt class="cap-webmail">use draft, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a>
 </dt>
+<dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
+</dt>
+<dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
+</dt>
+<dt class="cap-webmail">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
+</dt>
 </dl></dd>
+<dt class="cap-webmail">email</dt>
+<dd><dl><dt class="cap-webmail">Using Allowlists, <a class="indexterm" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a>
+</dt></dl></dd>
 <dt class="cap-webmail">Email filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a>
 </dt>
 <dd><dl>
@@ -911,7 +913,7 @@
 </dt>
 <dt class="cap-webmail">color quoted lines, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
-<dt class="cap-webmail">Confirm recipients when replying to a mailing list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a>
+<dt class="cap-webmail">confirm recipients when replying to a mailing list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a>
 </dt>
 <dt class="cap-webmail">default font style, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a>
 </dt>
@@ -927,7 +929,7 @@
 </dt>
 <dt class="cap-webmail">insert the original email text to a reply, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a>
 </dt>
-<dt class="cap-webmail">mark as read, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
+<dt class="cap-webmail">Mark as read, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
 <dt class="cap-webmail">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
@@ -935,6 +937,8 @@
 </dt>
 <dt class="cap-webmail">show date and time, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
+<dt class="cap-webmail">Show folder with all flagged messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
+</dt>
 <dt class="cap-webmail">show folder with all unseen messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
 <dt class="cap-webmail">show message size, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
@@ -943,6 +947,8 @@
 </dt>
 <dt class="cap-webmail">show text preview, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
+<dt class="cap-webmail">undo send, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
+</dt>
 <dt class="cap-webmail">vacation notice, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
 </dl></dd>
@@ -992,7 +998,7 @@
 </dl></dd>
 <dt class="cap-calendar">Export</dt>
 <dd><dl>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a>
 </dt>
@@ -1160,7 +1166,7 @@
 <h3>G</h3>
 <dl>
 <dt class="cap-edit_group">Groups</dt>
-<dd><dl><dt class="cap-edit_group">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.groups.html">Managing Groups</a>
+<dd><dl><dt class="cap-edit_group">Manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.groups.html">Managing Groups</a>
 </dt></dl></dd>
 <dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.chap.guard.html">Encrypting Data with Guard</a>
 </dt>
@@ -1271,15 +1277,15 @@
 </dl></dd>
 <dt class="cap-webmail">Import</dt>
 <dd><dl>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
-<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
 </dt>
 <dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 <dt class="cap-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
 </dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
@@ -1340,7 +1346,7 @@
 </dt>
 <dt class="cap-multifactor">Login</dt>
 <dd><dl>
-<dt class="cap-multifactor">recover verifications, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering verifications</a>
+<dt class="cap-multifactor">recover verification, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering verifications</a>
 </dt>
 <dt class="cap-multifactor">verify with authenticator app, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a>
 </dt>
@@ -1354,18 +1360,18 @@
 <div class="indexdiv">
 <h3>M</h3>
 <dl>
-<dt class="cap-webmail">Manage</dt>
+<dt class="cap-webmail">manage</dt>
 <dd><dl>
-<dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
-</dt>
 <dt class="cap-webmail">emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
 </dt>
+<dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
+</dt>
 </dl></dd>
-<dt class="cap-calendar">manage</dt>
+<dt class="cap-calendar">Manage</dt>
 <dd><dl>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
-<dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
+<dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
 </dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a>
 </dt>
@@ -1378,14 +1384,14 @@
 </dt>
 <dt class="cap-calendar">Mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
 </dt>
-<dt class="">Mobile devices, usage on, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Usage on Mobile Devices</a>
+<dt class="">Mobile devices, usage on, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a>
 </dt>
 <dt class="cap-multifactor">Multi-factor authentication, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
 </dt>
 <dd><dl>
 <dt class="cap-multifactor">manage verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.manage.html">Managing verification methods</a>
 </dt>
-<dt class="cap-multifactor">set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a>
+<dt class="cap-multifactor">set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1397,11 +1403,11 @@
 <dd><dl>
 <dt class="cap-tasks">add personal task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">add personal task list</a>
 </dt>
-<dt class="cap-contacts">address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a>
+<dt class="cap-contacts">address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a>
 </dt>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
 </dt>
-<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
+<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
 </dt>
@@ -1413,7 +1419,7 @@
 </dt>
 <dt class="cap-infostore">Drivefolders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Drive: Adding Folders</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: creating folders</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 <dt class="cap-webmail">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
 </dt>
@@ -1559,7 +1565,7 @@
 </dt>
 <dt class="cap-infostore">documents, text files, images, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
 </dt>
 <dt class="cap-calendar">list of appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a>
 </dt>
@@ -1601,9 +1607,9 @@
 <dd><dl>
 <dt class="cap-contacts">automatically add from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a>
 </dt>
-<dt class="cap-enterpriseaddressbook">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
+<dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
-<dt class="cap-edit_resource">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Managing Resources</a>
+<dt class="cap-edit_resource">Manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Managing Resources</a>
 </dt>
 <dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">use resource calendars</a>
 </dt>
@@ -1632,7 +1638,7 @@
 </dt>
 <dt class="cap-webmail">Search</dt>
 <dd><dl>
-<dt class="cap-calendar">Appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a>
 </dt>
@@ -1661,9 +1667,9 @@
 </dt>
 <dt class="cap-multifactor">multi-factor authentication, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
 </dt>
-<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a>
+<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
 </dt>
-<dt class="cap-webmail">use allowlists, <a class="indexterm" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a>
+<dt class="cap-webmail">Using Allowlists, <a class="indexterm" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a>
 </dt>
 <dt class="">Using Application Passwords, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a>
 </dt>
@@ -1672,12 +1678,12 @@
 <dd><dl>
 <dt class="cap-contacts">contacts as vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Set the presence status, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a>
 </dt>
-<dt class="cap-multifactor">Set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a>
+<dt class="cap-multifactor">Set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a>
 </dt>
 <dt class="">Settings</dt>
 <dd><dl>
@@ -1759,7 +1765,7 @@
 </dt>
 <dt class="">Sign in, sign out, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.login.html">Signing in, Signing out</a>
 </dt>
-<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a>
+<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
 </dt>
 <dt class="cap-portal">Subscribe</dt>
 <dd><dl>
@@ -1900,7 +1906,7 @@
 <dt class="cap-infostore">Upload</dt>
 <dd><dl><dt class="cap-infostore">file or folder, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
 </dt></dl></dd>
-<dt class="">Usage on Mobile Devices, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Usage on Mobile Devices</a>
+<dt class="">Usage on mobile devices, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a>
 </dt>
 <dt class="feat-io-ox-core-countdown">Use countdown for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Use countdown for appointments</a>
 </dt>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
index aee42875404c342170fc4bb31c0e52e1791df80c..e075129414fdcb650c44d9ded7e424cdb244561b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
@@ -74,7 +74,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
index c987080c7658c2ab4f8be8189aa3831957dc633b..dc26964dc9ffd8badeeb084cd11ecfb82603120a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -78,7 +78,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html
index 22ed7399b01332244ddeb4870e01f7b889e679ee..e8a05fb40f2ff6b97144f70998dfcc98cae5aa36 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html
@@ -110,7 +110,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.reminders.past"><b>Show reminders for past appointments. </b>Defines whether appointment reminders are displayed for past  appointments.</p></li></ul>
 <div id="ox.appsuite.user.reference.calendar.settings.countdown" class="feat-io-ox-core-countdown">
 <p id="ox.appsuite.user.reference.calendar.settings.countdown"></p>
-<h3 class="title">Countdown</h3>
+<h3 class="title">countdown</h3>
 <p><a class="indexterm" name="id-1.7.21.13.2"></a>Defines whether a countdown window will be displayed for upcoming appointments. Also see <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Use countdown for appointments</a></p>
 </div>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.call.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.call.html
index 3d133ac349170754bad90f1e248d8156cc070a6d..6ab578d56d733543a812ab8917998c4f10eccbc7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.call.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.call.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.contacts.html" title="Address Book">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.edit.html" title="Editing Contacts or Distribution Lists">
-<link rel="next" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
+<link rel="next" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.distributionlist.add.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.distributionlist.add.html
index 5bd00b833d73e4f4a71753f3b1f4d00e32cf1eb3..591685b6e82ead47fa0d232a0a6b726195e3d808 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.distributionlist.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.distributionlist.add.html
@@ -60,7 +60,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.html
index 93ed6b3e9a28732e1f1e848fb490c806228917ad..53bb3e54c8577f65d1986926aff696244d582b69 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Add Address Book</title>
+<title>Adding Address Book</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.contacts.folder">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Add Address Book</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Adding Address Book</h2></div></div></div>
 <a class="indexterm" name="id-1.8.16.2"></a><a class="indexterm" name="id-1.8.16.3"></a><p id="ox.appsuite.user.orientation.contacts.folder">With address books you can organize your contacts e.g. by separately saving them as business or private contacts. Learn how to create address books, use contacts from external address books and set the view for shared address books.</p>
 <p id="ox.appsuite.user.concept.contacts.folder">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
index 8fc2fd771d2d7495a60c8c6734d04f59099dc765..5004f09b3dd247f500015f73faf92131c87a8cc4 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
+<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.folder.subscribe.html" title="Subscribing to external address books">
 <link rel="next" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html" title="Subscribing to public and shared address books">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
-<h2 class="sr-only">Add Address Book</h2>
+<h2 class="sr-only">Adding Address Book</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.folder.managesubscribed">
 <div class="titlepage"><div><div><h3 class="title">Refreshing and managing address book subscriptions</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.10.2"></a><a class="indexterm" name="id-1.8.16.10.3"></a><p id="ox.appsuite.user.concept.contacts.folder.managesubscribed">The following options exist: </p>
@@ -62,7 +62,7 @@
 <p id="ox.appsuite.user.related.contacts.folder.managesubscribed"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p></li></ul>
-<p id="ox.appsuite.user.parent.contacts.folder.managesubscribed">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p id="ox.appsuite.user.parent.contacts.folder.managesubscribed">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
index 543906ec0112528d4d0b905f595f81b468c9ff5e..36379742069cbbfa52dd68ab5f6fabfb323b6e4a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
+<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
 <link rel="next" href="ox.appsuite.user.sect.contacts.folder.subscribe.html" title="Subscribing to external address books">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
-<h2 class="sr-only">Add Address Book</h2>
+<h2 class="sr-only">Adding Address Book</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.folder.personal">
 <div class="titlepage"><div><div><h3 class="title">Adding personal address books</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.8.2"></a><a class="indexterm" name="id-1.8.16.8.3"></a><p id="ox.appsuite.user.concept.contacts.folder.personal">You can create additional personal address books below My address books.</p>
@@ -56,7 +56,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">What are folder types?</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.contacts.folder.personal">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p id="ox.appsuite.user.parent.contacts.folder.personal">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
index 3338391d000e4a3d8d42f0956eaf6877419d4b67..87ec61186675f2a735a1f36b7699a1b3f7b59cba 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
+<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.folder.personal.html" title="Adding personal address books">
 <link rel="next" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html" title="Refreshing and managing address book subscriptions">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
-<h2 class="sr-only">Add Address Book</h2>
+<h2 class="sr-only">Adding Address Book</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.folder.subscribe">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to external address books</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.9.2"></a><a class="indexterm" name="id-1.8.16.9.3"></a><p id="ox.appsuite.user.concept.contacts.folder.subscribe">You can use your contacts from other providers within the groupware by subscribing to your external address books.</p>
@@ -67,7 +67,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">Refreshing and managing address book subscriptions</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.contacts.folder.subscribe">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p id="ox.appsuite.user.parent.contacts.folder.subscribe">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
index 66319ee0172ebeb651181498d950c2b1a338c62f..fc0bafec06e4a95300168c3d30a0198bf53eec66 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Add Address Book">
+<link rel="up" href="ox.appsuite.user.sect.contacts.folder.html" title="Adding Address Book">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html" title="Refreshing and managing address book subscriptions">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
-<h2 class="sr-only">Add Address Book</h2>
+<h2 class="sr-only">Adding Address Book</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.folder.subscribeshared">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to public and shared address books</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.11.2"></a><a class="indexterm" name="id-1.8.16.11.3"></a><p id="ox.appsuite.user.concept.contacts.folder.subscribeshared">Address books that are public or shared by other users can be used as follows: </p>
@@ -73,7 +73,7 @@
 <p role="presentation" class="cap-dataexport"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.contacts.folder.subscribeshared">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p id="ox.appsuite.user.parent.contacts.folder.subscribeshared">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.foldertree.html
index 080de0b8861288556bf2a81a05a85ec63584aa76..abe3245796c05f0dce92c25c90536d617b1bee7c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.foldertree.html
@@ -54,7 +54,7 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
index 573ad947d6fcd7831aa761c85ee2ba9e3998bfc8..8262f4a3506e3db81a2a1112a98c88551df8bee1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
@@ -45,7 +45,7 @@
 </ul>
 <p id="ox.appsuite.user.related.contacts.manage"></p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage">Parent topic: <a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">Address Book</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
index 21dc67c5db55e2ffc0d3c8e91421d3b027e7695d..eabc21acb19ee886099b53ab13077454fb1a769f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -80,7 +80,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.html
index 92c0bcb233e7ac718a577694ebd5aeac50249d65..df17071fec46c830ec6b5c20753f421c49736a79 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.html
@@ -35,7 +35,7 @@
 <a class="indexterm" name="id-1.8.8.2"></a><a class="indexterm" name="id-1.8.8.3"></a><p id="ox.appsuite.user.orientation.contacts.view">Learn how to select contacts from different address book and display their data. Depending on the configuration, you have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p></li>
+<li class="listitem feat-io-ox-core-enterprisePicker" id="id-1.8.8.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.haloview.html">Displaying contacts in the halo view</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.view"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
index e22fb2bafc10d2e90e1ee0d85158af43044025f2..865f5dd4fa6920b96b78e84348d24ef1408d8b9e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.edit.html
@@ -35,7 +35,10 @@
 <div class="titlepage"><div><div><h3 class="title">Viewing, editing, deleting accounts</h3></div></div></div>
 <a class="indexterm" name="id-1.11.7.9.2"></a><a class="indexterm" name="id-1.11.7.9.3"></a><a class="indexterm" name="id-1.11.7.9.4"></a><a class="indexterm" name="id-1.11.7.9.5"></a><a class="indexterm" name="id-1.11.7.9.6"></a><a class="indexterm" name="id-1.11.7.9.7"></a><p id="ox.appsuite.user.concept.dataorganisation.accounts.edit">Depending on the configuration and the account type, you can edit different account settings: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">for email accounts: account name, sender name, Unified Mail usage, server parameters, folder names</p></li>
+<li class="listitem">
+<p role="presentation">for email accounts: account name, sender name, Unified Mail usage, server parameters, folder names</p>
+<p role="presentation">Note: Depending on the configuration, you might not be able to edit your primary email account.</p>
+</li>
 <li class="listitem"><p role="presentation">for social networks: account name</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.dataorganisation.accounts.edit">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
index 7d086166af8595fd71c878c0f894efc9e8e28e2e..c33bcc46d1b0afedfd1924b04948a4de356778ea 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
@@ -36,7 +36,7 @@
 <a class="indexterm" name="id-1.11.7.7.2"></a><a class="indexterm" name="id-1.11.7.7.3"></a><a class="indexterm" name="id-1.11.7.7.4"></a><a class="indexterm" name="id-1.11.7.7.5"></a><p id="ox.appsuite.user.concept.dataorganisation.accounts.primarymail">You can edit your <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.primarymailaccount">primary email account</a>: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Change the name of your primary email account. This name is displayed in the email settings.</p></li>
-<li class="listitem"><p role="presentation">Change the preset sender name</p></li>
+<li class="listitem feat-io-ox-mail-editRealNames" id="id-1.11.7.7.6.2.2"><p role="presentation">Depending on the configuration, you can change the preset sender name.</p></li>
 <li class="listitem"><p role="presentation">Change the folder of your primary email account</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.dataorganisation.accounts.primarymail">
@@ -54,7 +54,7 @@
 <p role="presentation">To change the account name, click into the input field next to <span class="guibutton"><strong>Account name</strong></span>.</p>
 <p role="presentation">Note: The entries for <span class="guibutton"><strong>Incoming server</strong></span> and <span class="guibutton"><strong>Outgoing server</strong></span> can not be changed.</p>
 </li>
-<li class="listitem">
+<li class="listitem feat-io-ox-mail-editRealNames" id="id-1.11.7.7.7.2.3.2.2">
 <p role="presentation">To change the preset sender name, click into the input field next to <span class="guibutton"><strong>Your name</strong></span>.</p>
 <p role="presentation">You can overwrite this preset name when composing an email.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.html
index 89d0b27d5cd0a5fdc827d1d1206b1c3ecae8cf4d..7978f3a4d24ed9f98d1728870849120f32d8b5fd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.html
@@ -79,7 +79,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Add Address Book</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.folder.html"><span class="phrase">Drive</span>: Adding Folders</a></p>
 </li></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.share.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.share.html
index 033be86bf3851f0ef49fb311c4c9590da0269701..5ea2305fe85aee7dc36f65bf0bb6238ac215bdc4 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.share.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.share.html
@@ -48,7 +48,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">calendar </p>
+<p role="presentation">Calendar </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">The folders in <span class="guibutton"><strong>My calendars</strong></span> can be shared with internal users with read or edit permissions.</p></li>
 <li class="listitem"><p role="presentation">The <span class="guibutton"><strong>My calendars</strong></span> folder can not be shared.</p></li>
@@ -148,7 +148,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
index a22d52f1db58b572bd6b41fdc333b5a28e72dcbc..6f3eeb76d9dc2c082ae858a673ff402cb809ee10 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
@@ -37,7 +37,7 @@
 <li class="listitem"><p role="presentation">display attachments as preview or as a list</p></li>
 <li class="listitem"><p role="presentation">display an attachment in the Viewer</p></li>
 <li class="listitem"><p role="presentation">download attachments</p></li>
-<li class="listitem cap-infostore" id="id-1.6.10.5.1.4"><p role="presentation">depending on the configuration: save attachments in <span class="phrase">Drive</span></p></li>
+<li class="listitem cap-infostore" id="id-1.6.10.5.1.4"><p role="presentation">Depending on the configuration: save attachments in <span class="phrase">Drive</span></p></li>
 <li class="listitem"><p role="presentation">edit an attached document, start an attached presentation</p></li>
 <li class="listitem cap-infostore" id="id-1.6.10.5.1.6"><p role="presentation">view all attachments from sent or received emails in the <span class="phrase">Drive</span> app</p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
index 5f5213d133d761b993b8e13acc8f6a6547cad837..c83f016ff8045dec415eb562d515a7c2de7d67b0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
@@ -51,7 +51,7 @@
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p role="presentation">Select another sender address</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Show names</strong></span>. Defines whether the real name is displayed.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Edit names</strong></span>. Opens the window for editing the real name.</p></li>
+<li class="listitem feat-io-ox-mail-editRealNames" id="id-1.6.8.13.5.1.2.1.1.1.1.2.3"><p role="presentation"><span class="guibutton"><strong>Edit names</strong></span>. Opens the window for editing the real name.</p></li>
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span> button. Opens the <span class="guibutton"><strong>CC</strong></span> or <span class="guibutton"><strong>BCC</strong></span> input field.</p></li>
@@ -79,7 +79,7 @@
 <li class="listitem"><p role="presentation">An icon for showing or hiding the formatting options.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add local file</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.attachment"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span>. Adds local files.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add from Drive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.attachmentdrive"><object type="image/svg+xml" data="../../images/cloud.svg" height="15"></object></span>. Adds files that are saved in the <span class="phrase">Drive</span> app.</p></li>
-<li class="listitem"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Enable encryption</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.encrypt"><object type="image/svg+xml" data="../../images/unlock.svg" height="15"></object></span>. Encrypts the email. A function bar will be displayed above the email text. If clicking on <span class="guibutton"><strong>Options</strong></span>, a menu with encryption options opens:</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Enable encryption</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.encrypt"><object type="image/svg+xml" data="../../images/unlock.svg" height="15"></object></span>. Encrypts the email. A function bar will be displayed above the email text. If clicking on <span class="guibutton"><strong>Options</strong></span>, a menu with encryption options opens:</p></li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Opens a menu with further functions: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
index 37abefb00b1d430dfe92178a0c62b5a50bc3ad34..77f0274d0a89e4b9041797133f54f20b1afcaecb 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
@@ -60,6 +60,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Opens a menu with further functions for replying to, forwarding or organizing emails.</p></li>
+<li class="listitem"><p role="presentation">If the email contains external images, there will be buttons for displaying the external images, depending on the setting.</p></li>
 <li class="listitem">
 <p role="presentation">If the email contains attachments, further elements are displayed: </p>
 <ul class="itemizedlist" id="ox.appsuite.user.reference.email.gui.detailview.attachments" style="list-style-type: circle; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
index 3a570f9e83421fcb37d91e492bc454859ae1abfd..e819af3a088afaf2b38c2ab9beb8d41dfb065d2e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -46,8 +46,9 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archive</strong></span>. Contains the emails archived by you. This folder will be created automatically when initially archiving an email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>My folders</strong></span>. Contains the email folders created by you. This folder will be created automatically when initially creating an email folder.</p></li>
 </ul>
-<p> Depending on the configuration, further folders might be available: </p>
+<p> Depending on the configuration and mail settings, further folders might be available. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Folders for unread emails, folders for flagged messages</p></li>
 <li class="listitem"><p role="presentation">Shared and public email folders you subscribed to.</p></li>
 <li class="listitem"><p role="presentation">Folders from functional email accounts that have  been assigned to you by the administrator.</p></li>
 </ul>
@@ -60,6 +61,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
index f050c819eacedc1bb77d26f57ee61d3b5c4dc26a..cf360a780d1aa35785472d1d2b9d50c89411454e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
@@ -36,7 +36,7 @@
 <a class="indexterm" name="id-1.6.8.6.2"></a><p id="ox.appsuite.user.concept.email.gui.new">Creates a new email. If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, a menu with further functions opens: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Add mail account</p></li>
-<li class="listitem cap-infostore" id="id-1.6.8.6.3.3.2"><p role="presentation">depending on the configuration: View all attachments</p></li>
+<li class="listitem cap-infostore" id="id-1.6.8.6.3.3.2"><p role="presentation">Depending on the configuration: View all attachments</p></li>
 <li class="listitem"><p role="presentation">New appointment, New contact, New task</p></li>
 </ul>
 <p id="ox.appsuite.user.hint.email.gui.new">Note: If the folder is closed, the button will be displayed as icon. In this case, the <span class="guibutton"><strong>More actions</strong></span> icon will not be available. To show the folder view, click the <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> on the bottom left side.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
index dee44596efdd2b790c17b5de016849efe19c4772..7fcc2945b48dbad69792216a7c0c45e91cd699c7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -41,7 +41,7 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>List options</strong></span>. Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add mail account</strong></span>. Opens a window for adding additional email accounts.</p></li>
 <li class="listitem cap-infostore" id="id-1.6.8.5.3.3.6"><p role="presentation"><span class="guibutton"><strong>All attachments</strong></span>. Shows all email attachments that you have sent or received, in the <span class="phrase">Drive</span> app.</p></li>
-<li class="listitem"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Inbox tabs</strong></span>. Opens the window for configuring the inbox tabs bar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Vacation notice</strong></span>. Opens the window for activating and configuring a vacation notice.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Statistics</strong></span>. Shows current statistics for your inbox: the most frequent senders, numbers of emails per week day, numbers of emails per hour</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
index d757bfcddfe8ff8735fee40eefa12b4871fbce10..9c8f6193a57c1d181e174512fd4d8c58b2d8a102 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -41,8 +41,8 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archives the emails selected by you.</p></li>
 <li class="listitem"><p role="presentation">Icons for <span class="guibutton"><strong>replying to</strong></span> and <span class="guibutton"><strong>forwarding</strong></span> the selected emails: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opens a menu allowing you to move an email to a category. This icon is only available if the inbox tabs bar is displayed.</p></li>
-<li class="listitem"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Set color</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opens a menu allowing you to assign a colored label to the selected emails.</p></li>
-<li class="listitem"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Flags the email.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set color</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opens a menu allowing you to assign a colored label to the selected emails.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Flags the email.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Move</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.moveto"><object type="image/svg+xml" data="../../images/folder-symlink.svg" height="15"></object></span>. Moves the selected emails to another folder.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Opens a menu with functions for managing emails.</p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
index b5a0fe15bd6fd06b62460f4a4c5958dd9bb9b978..c891b2f5f27f1b3e47bebdb01a39f998fcbde667 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
@@ -50,8 +50,13 @@
 </li>
 <li class="step"><p role="presentation">You can finish editing the email or send the email: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">In order to finish editing the email, click the <span class="guibutton"><strong>Close</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.senddraft.cancel"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the title bar.</p>
-<p role="presentation">You can save or delete the draft.</p>
+<p role="presentation">In order to finish editing the email, click the <span class="guibutton"><strong>Close</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.senddraft.cancel"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the title bar. The <span class="guilabel"><strong>Save draft</strong></span> window opens.</p>
+<p role="presentation">In order to save your changes to the draft, click on <span class="guibutton"><strong>Save draft</strong></span>.</p>
+<p role="presentation">To discard your changes to the draft, click on <span class="guibutton"><strong>Delete draft</strong></span>.</p>
+</li>
+<li class="listitem">
+<p role="presentation">To finish editing and save your changes to the draft, click the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.senddraft.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the button bar.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Save and close draft</strong></span>.</p>
 </li>
 <li class="listitem"><p role="presentation">To send the E-Mail, click on <span class="guibutton"><strong>Send</strong></span>.</p></li>
 </ul></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
index 386ca32a303bc22c7891686862ed840678879c26..6f66f13d382535753e71a1c18078a8a6b0b0009f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
@@ -49,7 +49,10 @@
 <li class="listitem"><p role="presentation">If the recipients are not to see who gets a copy of the email, enter the recipients in  the <span class="guibutton"><strong>BCC</strong></span> field.</p></li>
 </ul></p></li>
 <li class="step"><p role="presentation">Enter a subject. Enter the email text.</p></li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Send</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>Send</strong></span>.</p>
+<p role="presentation" class="feat-io-ox-core-undoSend">Tip: Depending on the configuration, you can recall the sending of an email within a short time frame. To do so, click on <span class="guibutton"><strong>Undo</strong></span> next to <span class="guibutton"><strong>Send</strong></span> in the display area. You can configure this behavior in the email settings.</p>
+</li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.options.email.send.new">Options: </p>
@@ -93,7 +96,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
@@ -113,7 +116,10 @@
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
index d61f6ea592235ba7b8f680a28fa589f9c11d7de1..bf992b162597fc006833546c5d1467dd62bc1317 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
@@ -42,13 +42,13 @@
 <p role="presentation">Select an email address.</p>
 <p role="presentation">Note: Depending on the configuration, you might not be able to use email addresses from external email accounts.</p>
 </li>
-<li class="step">
-<p role="presentation">You can define the name to be displayed with your email addresses. To do so, proceed as follows:</p>
+<li class="step"><p role="presentation">In order to display the sender addresses without names, disable <span class="guibutton"><strong>Show names</strong></span>.</p></li>
+<li class="step feat-io-ox-mail-editRealNames">
+<p role="presentation">Depending on the configuration, you can define the name to be displayed with your email addresses. To do so, proceed as follows:</p>
 <ol type="a" class="substeps">
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Edit name</strong></span>. The <span class="guilabel"><strong>Edit real names</strong></span> window opens. The window displays the names that are preset in the account settings.</p></li>
 <li class="step"><p role="presentation">Enable the checkbox of the name that you want to edit. Edit the name. Click on <span class="guibutton"><strong>Save</strong></span>.</p></li>
 </ol>
-<p role="presentation">In order to display the sender addresses without names, disable <span class="guibutton"><strong>Show names</strong></span>.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
index a6a26bcdba10bb0031999327b25ff14d32214c6d..65a8314551671aad6aa02f5f4c3162924358c4e1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
@@ -69,7 +69,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.compose.appendvcard"><b>Append vcard. </b><a class="indexterm" name="id-1.6.19.8.8.3.1.1.1.2"></a>Specifies whether your contact data will be attached to a new email in the vCard format.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.compose.quote"><b>Insert the original email text to a reply. </b><a class="indexterm" name="id-1.6.19.8.8.3.1.2.1.2"></a>Specifies whether the original email text is appended to an email reply.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.compose.mailinglist"><b>Confirm recipients when replying to a mailing list. </b><a class="indexterm" name="id-1.6.19.8.8.3.1.3.1.2"></a>Defines whether you have to confirm the recipient when replying to a mailing list.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.compose.mailinglist"><b>confirm recipients when replying to a mailing list. </b><a class="indexterm" name="id-1.6.19.8.8.3.1.3.1.2"></a>Defines whether you have to confirm the recipient when replying to a mailing list.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.compose.sender"><b>Default sender address. </b><a class="indexterm" name="id-1.6.19.8.8.3.1.4.1.2"></a>Specifies the pre-set sender address for new emails.</p>
 <p role="presentation">Note: The sender's name is displayed in front of the sender address. If you enter a name in the <span class="guibutton"><strong>Your name</strong></span> input field in the account settings, this name overwrites the preset sender name.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
index be0d893e60c1139122336e6d5e8f0623e2478c12..390bafeb2cfbe2b56c8cb26d716d43f0fce4ba2c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
@@ -69,21 +69,31 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.display.quoting"><b>Color quoted lines. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.2.1.2"></a>Specifies whether original messages are highlighted and introduced with a vertical line. This option assumes that the original mail text is not attached but appended to the email.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.fixedfont"><b>Use fixed-width font for text mails. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.3.1.2"></a>Specifies whether a fixed-width font is used when displaying a plain text email.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.deliveryreceipt"><b>show requests for read receipts. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.4.1.2"></a>Defines whether a return receipt is displayed if a received email includes receipt confirmation request.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.unreadfolder"><b>show folder with all unseen messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.5.1.2"></a>Defines whether the <span class="guibutton"><strong>Unread messages</strong></span> folder is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.unreadfolder"><b>show folder with all unseen messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.5.1.2"></a>Defines whether the <span class="guibutton"><strong>Unread </strong></span> folder is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.markedfolder"><b>Show folder with all flagged messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.6.1.2"></a>Defines whether the <span class="guibutton"><strong>Flagged </strong></span> folder is displayed in the folder view.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.email.settings.receive.markasread"></p>
-<h4 class="title">mark as read</h4>
+<h4 class="title">Mark as read</h4>
 <p><a class="indexterm" name="id-1.6.19.7.8.2"></a><a class="indexterm" name="id-1.6.19.7.8.3"></a>Defines the period after which an email will be automatically marked as read when selecting the email. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.markasread.immediately"><b>Immediately. </b>The email will immediately be marked as read.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.markasread.seconds"><b>After 5 seconds, after 20 seconds. </b>The email will be marked as read after the period defined.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.markasread.never"><b>Never. </b>The email will not automatically be marked as read.</p></li>
 </ul>
+<div id="ox.appsuite.user.reference.email.settings.receive.undosend" class="feat-io-ox-core-undoSend">
+<p id="ox.appsuite.user.reference.email.settings.receive.undosend"></p>
+<h4 class="title">Undo send</h4>
+<p><a class="indexterm" name="id-1.6.19.7.9.2"></a>Defines whether emails will be sent immediately or with a short delay. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.undosend.immediately"><b>Without delay. </b>The email will be sent immediately. You can not undo the sending of the email.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.undosend.seconds"><b>5 seconds, 10 seconds. </b>The email will be sent with the delay selected. You can undo the sending of the email within this time frame.</p></li>
+</ul>
+</div>
 <p id="ox.appsuite.user.reference.email.settings.receive.notificationsounds"></p>
 <h4 class="title">Notification sounds</h4>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.receive.notificationsounds.playsound"><b>Play sound on incoming mail. </b><a class="indexterm" name="id-1.6.19.7.9.2.1.1.1.2"></a><a class="indexterm" name="id-1.6.19.7.9.2.1.1.1.3"></a>Defines whether a sound is played for incoming messages if the groupware is in the background.</p>
+<p id="ox.appsuite.user.reference.email.settings.receive.notificationsounds.playsound"><b>Play sound on incoming mail. </b><a class="indexterm" name="id-1.6.19.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.6.19.7.10.2.1.1.1.3"></a>Defines whether a sound is played for incoming messages if the groupware is in the background.</p>
 <p role="presentation">Note: Desktop notifications have to be allowed in the browser settings. See <a class="xref" href="ox.appsuite.user.sect.settings.desktopnotifications.html">use desktop notifications</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.notificationsounds.sound"><b>Sound. </b>You can select between different sounds.</p></li>
@@ -92,20 +102,22 @@
 <h4 class="title">Behavior</h4>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.common.delete"><b>permanently remove deleted emails. </b><a class="indexterm" name="id-1.6.19.7.10.2.1.1.1.2"></a>Defines whether deleted emails will be removed permanently or whether they will go to the trash folder.</p>
+<p id="ox.appsuite.user.reference.email.settings.common.delete"><b>permanently remove deleted emails. </b><a class="indexterm" name="id-1.6.19.7.11.2.1.1.1.2"></a>Defines whether deleted emails will be removed permanently or whether they will go to the trash folder.</p>
 <p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Permanently removed email messages can not be restored.</p>
 <p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a></p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.collectsend"><b>Automatically collect contacts in the "Collected addresses" folder while sending emails. </b><a class="indexterm" name="id-1.6.19.7.10.2.1.2.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected contacts</strong></span> folder when sending a new email.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.collectread"><b>Automatically collect contacts in the "Collected addresses" folder while reading emails. </b><a class="indexterm" name="id-1.6.19.7.10.2.1.3.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected addresses</strong></span> folder when reading a new email.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.mailto"><b>ask for mailto link registration. </b><a class="indexterm" name="id-1.6.19.7.10.2.1.4.1.2"></a>Defines whether the groupware can ask for a mailto link registration.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.collectsend"><b>Automatically collect contacts in the "Collected addresses" folder while sending emails. </b><a class="indexterm" name="id-1.6.19.7.11.2.1.2.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected contacts</strong></span> folder when sending a new email.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.collectread"><b>Automatically collect contacts in the "Collected addresses" folder while reading emails. </b><a class="indexterm" name="id-1.6.19.7.11.2.1.3.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected addresses</strong></span> folder when reading a new email.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.mailto"><b>ask for mailto link registration. </b><a class="indexterm" name="id-1.6.19.7.11.2.1.4.1.2"></a>Defines whether the groupware can ask for a mailto link registration.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.settings.receive"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">Email</span> list view</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">Email</span> folder view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.view.html b/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
index b437cb35af73d72b1d37e145b8ac12a9cb15aacb..708cbfac1fc0232435028f0ae9d9a5925b905628 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
@@ -56,6 +56,11 @@
 <p id="ox.appsuite.user.options.email.view">Options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
+<p role="presentation">In the security settings, you can determine whether external images are loaded, see <a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>.</p>
+<p role="presentation">Depending on the setting, you can view external images by clicking on <span class="guibutton"><strong>Show images</strong></span>.</p>
+<p role="presentation">If you want external images to always be displayed in emails from the sender of the current email, click on <span class="guibutton"><strong>Always show images from</strong></span>.</p>
+</li>
+<li class="listitem">
 <p role="presentation">To sort the E-Mail list, use the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.options.email.view.actions.sort"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list view.</p>
 <p role="presentation">The sorting setting will be applied to the selected email folder. You can use different settings for the single folders.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.create.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.create.html
index aefbd04351e2b196c48b98c9f1323cf05fb5b17a..0cf833a47785bc80137bb9d7ae8702e54a939229 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.create.html
@@ -80,7 +80,7 @@
 <p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.gui.create.html">The editing window</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressdirectory.html">Displaying contacts in the address list</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.menubar.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.menubar.html
index fbf241c62df2f94c6dec35c28b7fc2be907afc69..5203c1c1dd8146f367c946597049b40894efe20b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.menubar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.menubar.html
@@ -41,12 +41,12 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. Opens a menu with icons for launching an app.</p></li>
 <li class="listitem">
-<p role="presentation">depending on the configuration: Quick launch icons for launching frequently used apps.</p>
+<p role="presentation">Depending on the configuration: Quick launch icons for launching frequently used apps.</p>
 <p role="presentation">The context menu allows to define the apps that should be displayed as quick launch icons.</p>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Search field</strong></span>. Allows to search the groupware objects of the current app.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.unreadbadge"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The icon is displayed when receiving a new notification. The icon notifies you of the number of new notifications e.g., new appointment invitations. If clicking the icon, the notification area opens.</p></li>
-<li class="listitem cap-switchboard" id="id-1.3.7.7.5.2.6"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Call history</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opens the call history that shows all calls or missed calls. If clicking on an entry, the window for calling this contact will be opened.</p></li>
+<li class="listitem cap-switchboard" id="id-1.3.7.7.5.2.6"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Call history</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.call"><object type="image/svg+xml" data="../../images/telephone.svg" height="15"></object></span>. Opens the call history that shows all calls or missed calls. If clicking on an entry, the window for calling this contact will be opened.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Refresh</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.refresh"><object type="image/svg+xml" data="../../images/arrow-repeat.svg" height="15"></object></span>. Reloads objects from the server. Irrespective of this function, objects are refreshed in regular intervals.</p></li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>Help</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.menubar.help"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span>. Opens a menu with further functions: </p>
@@ -66,12 +66,13 @@
 <li class="listitem"><p role="presentation">Adjust all settings</p></li>
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation">Depending on the app, functions for selecting a layout, app-specific display options or app-specific functions will be available.</p></li>
-<li class="listitem"><p role="presentation">depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 </ul>
 </li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>My account</strong></span> icon. Opens a menu with further functions: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem cap-switchboard" id="id-1.3.7.7.5.2.10.1.2.1"><p role="presentation">Depending on the configuration: Icons for setting your availability for calls.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Download personal data</strong></span>. Opens a window where you can adjust your personal contact data.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sign out</strong></span>. Signs you out from the groupware.</p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.examples.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.examples.html
index 862f0901fa122ab8f7bbe49ac9d0052c70e90fea..51c373b55dc05a126e957f553524e13610b850dd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.examples.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.firststeps.keyboard.html" title="Keyboard Input">
 <link rel="prev" href="ox.appsuite.user.sect.firststeps.keyboard.elements.html" title="Interacting with the user interface via keyboard">
-<link rel="next" href="ox.appsuite.user.sect.firststeps.mobile.html" title="Usage on Mobile Devices">
+<link rel="next" href="ox.appsuite.user.sect.firststeps.mobile.html" title="Notes on Use on Mobile Devices">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.mobile.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.mobile.html
index ac4f1f8be6dcc882d07e7af1f3c8794242ace08a..67a351bf6a521bac477ed74fbfe85129029acd91 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.mobile.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.mobile.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Usage on Mobile Devices</title>
+<title>Notes on Use on Mobile Devices</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,12 +31,13 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">First Steps</h1>
 <div class="sect1" id="ox.appsuite.user.sect.firststeps.mobile">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Usage on Mobile Devices</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Notes on Use on Mobile Devices</h2></div></div></div>
 <a class="indexterm" name="id-1.3.9.2"></a><a class="indexterm" name="id-1.3.9.3"></a><p id="ox.appsuite.user.concept.firststeps.mobile">You can also utilize the groupware on your Android or iOS mobile device. Compared to the usage on a computer, there are the following differences: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The user interface automatically adjusts to the smaller screen.</p></li>
+<li class="listitem"><p role="presentation">Depending on the app, certain screen layouts might not be available. The available layouts are adapted to the screen size of mobile devices.</p></li>
 <li class="listitem"><p role="presentation">The user interface follows the standards for mobile devices.</p></li>
-<li class="listitem"><p role="presentation">Some less frequently used functions are not available on a mobile device.</p></li>
+<li class="listitem"><p role="presentation">Depending on the app, seldom used functions and settings might not be available.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.firststeps.keyboard.mobile.start">
 <p class="title">How to launch the groupware on a mobile device:</p>
@@ -58,6 +59,7 @@
         <p>If you launch the groupware by tapping the icon, the browser's address bar will not be displayed. This saves space for the groupware interface.</p>
       </div>
 </div>
+<p id="ox.appsuite.user.hint.firststeps.mobile">Note: This user guide describes how to use the groupware on a computer. The operation on a mobile device follows the usual processes on mobile devices.</p>
 <p id="ox.appsuite.user.parent.firststeps.mobile">Parent topic: <a class="xref" href="ox.appsuite.user.chap.firststeps.html"><i>First Steps</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html b/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
index e5a6fbe3e388fc0e25d45ea8fc2e6d95762fb0d3..e7fb9ec1e1bfe312226894e27eb3e3e2733b1aa5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
@@ -73,7 +73,7 @@
 <p id="ox.appsuite.user.related.security.apppasswords"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a></p>
 </li></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html b/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
index d3387a56c6312c9fdd177f107f57a0647184fbc2..be5d23f9694d558375f1b25a828db5133de03ac9 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Signing Out Automatically</title>
+<title>Signing out Automatically</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.autologout">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Signing Out Automatically</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Signing out Automatically</h2></div></div></div>
 <a class="indexterm" name="id-1.12.5.2"></a><a class="indexterm" name="id-1.12.5.3"></a><p id="ox.appsuite.user.concept.security.autologout">You can define whether you are automatically signed out if you have not worked with the groupware for a specific time.</p>
 <div class="task" id="ox.appsuite.user.task.security.autologout">
 <p class="title">How to define whether you are automatically signed out:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html b/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
index 93081d9ac07f7f6bacf8479c0267de0aebf4bcfe..e206a2e1f3b3e010735dc560ab35fdef0c1afc26 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
-<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Signing Out Automatically">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="next" href="ox.appsuite.user.sect.security.whitelist.html" title="Using Allowlists">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.emaillinkedimages">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Externally Linked Images in Emails</h2></div></div></div>
-<a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.concept.security.emaillinkedimages">Externally linked images are not part of the email itself. They are loaded from an external source upon reading the email. You can define whether those images are loaded and displayed. If you allow loading externally linked images, your privacy and computer are endangered by the following security issues: </p>
+<a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.concept.security.emaillinkedimages">External images are not part of the email itself. They are loaded from an external source upon reading the email. You can define whether those images are loaded and displayed. If you allow loading externally linked images, your privacy and computer are endangered by the following security issues: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The sender can gather information, e.g. whether your email address is valid or when you retrieved the email. Such information can e.g. be used to purposefully send spam emails.</p></li>
 <li class="listitem"><p role="presentation">The externally linked graphic can be used to infect your computer with malware.</p></li>
@@ -45,9 +45,10 @@
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p></li>
-<li class="step"><p role="presentation">You can enable or disable the <span class="guibutton"><strong>Allow pre-loading of externally linked images</strong></span> option. <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">If externally linked images are not to be displayed, disable the setting.</p></li>
-<li class="listitem"><p role="presentation">If externally linked images are to be loaded and displayed, enable the setting.</p></li>
+<li class="step"><p role="presentation">Define the behavior below <span class="guibutton"><strong>External images in emails</strong></span>. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">If externally linked images are to be loaded and displayed, enable <span class="guibutton"><strong>Always show external images</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">If you always want to be asked whether externally linked images should be displayed, enable <span class="guibutton"><strong>Ask before showing external images</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">You can specify that externally linked images are always displayed if they come from specific senders. To do so, enter the email addresses of these senders in the input field below <span class="guibutton"><strong>Always show external images for the following senders</strong></span>.</p></li>
 </ul></p></li>
 </ol></div>
 </div>
@@ -55,7 +56,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
index 3d1c34855d553e5ee80f40cb47f4d512c52b71dd..fecda8e9929267a4d545f3b6aabcd61efcb1d6eb 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.security.multifactor.html" title="Multi-Factor Authentication">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Setting up verification methods">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Sett8ing up verification methods">
 <link rel="next" href="ox.appsuite.user.sect.security.multifactor.securitykey.html" title="Verifying the login with a security key">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -60,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.authenticator">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
index c1830292012b0c78bf7caec6ac2e6bfe52cd3756..f04317e204555d7d181c013e19fc2f1f9e4c5a86 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
 <link rel="prev" href="ox.appsuite.user.sect.security.apppasswords.html" title="Using Application Passwords">
-<link rel="next" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Setting up verification methods">
+<link rel="next" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Sett8ing up verification methods">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -50,7 +50,7 @@
 </ul>
 <p> The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
index 59bccc1af53614ba653eb9fc226775df7d862802..dd2ff898dce30363f2460a02755ac351ed5911df 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
@@ -44,7 +44,7 @@
 <p class="title">How to manage verification methods or verification devices:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.security.multifactor.manage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.security.multifactor.manage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -60,7 +60,7 @@
 </div>
 <p id="ox.appsuite.user.related.security.multifactor.manage"></p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li></ul>
 <p id="ox.appsuite.user.parent.security.multifactor.manage">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
index 0a573afb9a39080962292e9d3226fe31c29527ce..6fc6a02ede6c3a36b2652b639643df5b0e47ec00 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.recovery">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
index 788ac0c9466256343acfd0df1b5656f40d43e307..56a74b1e035847e6438af1bb54381469f529b3b8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
@@ -58,7 +58,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.securitykey">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
index 7ec1da56d6ba73747a5b6c86fb1bcf490d884b7c..54c5a0f729c37823f9869e1f0463bccaaacc60b3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Setting up verification methods</title>
+<title>Sett8ing up verification methods</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,10 +32,10 @@
   <h1 class="sr-only">Data Security</h1>
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.settings">
-<div class="titlepage"><div><div><h3 class="title">Setting up verification methods</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Sett8ing up verification methods</h3></div></div></div>
 <a class="indexterm" name="id-1.12.10.7.2"></a><a class="indexterm" name="id-1.12.10.7.3"></a><p id="ox.appsuite.user.concept.security.multifactor.settings">Prior to being able to use a 2-step verification for the next login, you have to set up the additional verification methods wanted. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Set up verification methods</p></li>
+<li class="listitem"><p role="presentation">Setting up verification methods</p></li>
 <li class="listitem">
 <p role="presentation">As soon as having set up an initial verification method, you have to set a recovery method. You need the recovery e.g. in case you have lost your device that you use for the verification.</p>
 <p role="presentation">In this case, you can log in to the groupware by using the recovery method.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
index ab00f094f035003042cbab00e7ca86e91638938b..c03f3add6a5cb56093651e8f7eef6f011b9eeb17 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
@@ -56,7 +56,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.sms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html b/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
index 840ba7b226420d3a88192e915202fc1a15d4de16..4fe0f5facf2952d504298593cf1407327c74c002 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
@@ -64,7 +64,7 @@
 <p id="ox.appsuite.user.related.security.sessions"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.whitelist.html b/help/l10n/en_US/ox.appsuite.user.sect.security.whitelist.html
index 9ab66ff90b553e539c116145c24a573fd9285280..ac6772bc5aea913fa6778b59dfe6b3042b09ed20 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.whitelist.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.whitelist.html
@@ -57,7 +57,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing Out Automatically</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.participants.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.participants.html
index 017ff0c228036e18c398f2bd2b416d1b80f16cc6..704674025f76c86b2afe91d0af1f2fa5f0df62de 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.participants.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.participants.html
@@ -53,7 +53,7 @@
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
+<p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creating Tasks</a></p>
 </div>