diff --git a/help/l10n/en_US/bk01-toc.html b/help/l10n/en_US/bk01-toc.html
index c0bf1a972e2d2844a5fc927655b402ea91bb873d..8242392d75efc0f982da421280775fd8e559556b 100644
--- a/help/l10n/en_US/bk01-toc.html
+++ b/help/l10n/en_US/bk01-toc.html
@@ -124,7 +124,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.foldertree.html">The <span class="phrase">Email</span> folder view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">Email</span> toolbar</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">Email</span> tabs bar</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">Email</span> list view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">Email</span> detail view</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.gui.popup.html">The <span class="phrase">Email</span> pop-up</a></li>
@@ -134,15 +134,16 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Sending Emails</a><ul>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></li>
-<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></li>
+<a href="ox.appsuite.user.sect.email.send.html">send emails</a><ul>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></li>
-<li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></li>
+<li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></li>
+<li class="sect2 feat-io-ox-core-scheduleSend"><a href="ox.appsuite.user.sect.email.send.later.html">Sending emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></li>
@@ -151,9 +152,9 @@
 </ul>
 </li>
 <li class="sect1 feat-io-ox-core-openai">
-<a href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a><ul>
-<li class="sect2"><a href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a></li>
-<li class="sect2"><a href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></li>
+<a href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a><ul>
+<li class="sect2"><a href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a></li>
+<li class="sect2"><a href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when composing emails</a></li>
 </ul>
 </li>
 <li class="sect1 cap-webmail cap-switchboard"><a href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></li>
@@ -164,6 +165,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></li>
@@ -175,6 +177,9 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></li>
+<li class="sect2 cap-dumpster"><a href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></li>
 </ul>
@@ -241,6 +246,7 @@
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></li>
+<li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Forwarding appointment invitations</a></li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></li>
 <li class="sect1 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></li>
 <li class="sect1 cap-calendar">
@@ -258,6 +264,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite time zones</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></li>
@@ -340,6 +347,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></li>
@@ -379,7 +387,7 @@
 <li class="sect1 cap-tasks"><a href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></li>
 <li class="sect1 cap-tasks cap-switchboard"><a href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a></li>
 <li class="sect1 cap-tasks">
-<a href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a><ul>
+<a href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.folder.personal.html">Adding personal task list</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a></li>
 </ul>
@@ -388,6 +396,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></li>
diff --git a/help/l10n/en_US/index.html b/help/l10n/en_US/index.html
index acd4ade6a6b218c09b711a819b975d9c7fc57bf8..79debcfa7eeee4974f3be3e1667df59e5a67be44 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">Friday, October 27, 2023 Version 8.19.0 </p></div>
+<div><p class="pubdate">Thursday, November 16, 2023 Version 8.20.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -67,6 +67,13 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
 </ul>
 </li>
+<li class="listitem" id="ox.appsuite.user.startpage.toc.keyboard" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.keyboard.html"><i>Keyboard Input</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.keyboard.navigation.html">Using the Keyboard Navigation</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.keyboard.shortkeys.html">Using Keyboard Shortcuts</a></p></li>
+</ul>
+</li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.portal" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.portal.html"><i><span class="phrase">Portal</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -80,16 +87,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">Email</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.5.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.1.6.2.2.1.6.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.5.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p></li>
-<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.5.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
+<li class="listitem cap-webmail" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-calendar" id="ox.appsuite.user.startpage.toc.calendar">
@@ -99,17 +106,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Forwarding appointment invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.7.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.1.6.2.2.1.7.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Using Groups</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a></p></li>
-<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.7.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Using Groups</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.1.6.2.2.1.7.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.1.6.2.2.1.7.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a></p></li>
+<li class="listitem cap-calendar" id="id-1.1.6.2.2.1.7.1.17"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-contacts" id="ox.appsuite.user.startpage.toc.contacts">
@@ -118,16 +126,16 @@
 <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 feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.7.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 feat-io-ox-core-enterprisePicker" id="id-1.1.6.2.2.1.8.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.7.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.call.html">Calling Contacts</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.8.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">Adding Address Books</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>
-<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.7.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a></p></li>
+<li class="listitem cap-contacts" id="id-1.1.6.2.2.1.8.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-tasks" id="ox.appsuite.user.startpage.toc.tasks">
@@ -138,7 +146,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.html">Creating Tasks</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.invitation.html">Responding to Task Invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p></li>
 </ul>
@@ -154,18 +162,18 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and <span class="phrase">Drive</span> Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.9.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</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.dataorganisation.folder.html">Managing Data with Folders</a></p></li>
-<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.10.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
-<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.10.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li>
+<li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.10.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.10.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.security" style="list-style-type: none">
@@ -174,7 +182,7 @@
 <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.sessions.html">Displaying or Signing Out from Active Clients</a></p></li>
-<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.11.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p></li>
+<li class="listitem cap-multifactor" id="id-1.1.6.2.2.1.12.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p></li>
 </ul>
 </li>
 <li class="listitem cap-guard" id="ox.appsuite.user.startpage.toc.guard">
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.calendar.html b/help/l10n/en_US/ox.appsuite.user.chap.calendar.html
index f2f9c6a10dfa85d58c72c8b68615912aa2ae43dc..df72b72036f10ab21e05831882d919813e4d3532 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.calendar.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Email Settings">
+<link rel="prev" href="ox.appsuite.user.sect.email.mailfilter.apply.html" title="Applying a rule to existing emails">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="The Calendar Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.mailfilter.apply.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Next</a></li>
@@ -46,16 +46,17 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Forwarding appointment invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.8.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.8.6.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p></li>
-<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.8.6.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a></p></li>
+<li class="listitem feat-io-ox-core-resourceCalendars" id="id-1.8.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p></li>
-<li class="listitem cap-deputy" id="id-1.8.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
-<li class="listitem cap-edit_group" id="id-1.8.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Using Groups</a></p></li>
-<li class="listitem cap-edit_resource" id="id-1.8.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a></p></li>
-<li class="listitem feat-io-ox-core-managedResources" id="id-1.8.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a></p></li>
+<li class="listitem cap-deputy" id="id-1.8.6.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
+<li class="listitem cap-edit_group" id="id-1.8.6.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.groups.html">Using Groups</a></p></li>
+<li class="listitem cap-edit_resource" id="id-1.8.6.1.15"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</a></p></li>
+<li class="listitem feat-io-ox-core-managedResources" id="id-1.8.6.1.16"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a></p></li>
 </ul>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
index 2631d4dd15f66cef37d8796be8583d1db5bc932a..b158dce76b051104219095ebe744fc29bdd2234b 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Setting up WebDAV under Windows">
+<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Drive Settings">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Managing Data with Folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.drive.html b/help/l10n/en_US/ox.appsuite.user.chap.drive.html
index 753d079c99a16854a4386b73a09b70e9e8b3f66d..db2cd609afaf84b349586acd4a9e77be4074b705 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.drive.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Searching for Tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Deleting tasks">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="The Drive Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.email.html b/help/l10n/en_US/ox.appsuite.user.chap.email.html
index 3444f88f656dc387540c10c6e8eaf129ee894c56..2c75f9eb39f21e7d659166ba049a9096ca55f17c 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.email.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.email.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.portal.customize.createxing.html" title="Creating a Xing account">
+<link rel="prev" href="ox.appsuite.user.sect.portal.settings.html" title="Portal Settings">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.html" title="The Email Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.portal.customize.createxing.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.portal.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.gui.html">Next</a></li>
@@ -44,8 +44,8 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">Email</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p></li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.7.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.guard.html b/help/l10n/en_US/ox.appsuite.user.chap.guard.html
index becd8cedd18733152f0c7e6b80e5baa1211d22aa..bac2f6b245ac59ed05e2da614ba3d41877978cbe 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.guard.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Managing verification methods">
+<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Setting up Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.autologout.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Next</a></li>
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 77d0a012eaf291712930249fccb2523554200ff2..536a1dbb65d7e90d77c349b2d833dd3257441a2a 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.security.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Downloading Personal Data">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Displaying or Signing Out from Active Clients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.tasks.html b/help/l10n/en_US/ox.appsuite.user.chap.tasks.html
index d8cd149064fb85bd11a1c1c7fbf38985b23b6234..dac9f2b258dd3e08abb6c077449774e334eed458 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.tasks.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Address Book Settings">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Deleting contacts">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="The Tasks Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Next</a></li>
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.invitation.html">Responding to Task Invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.10.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.index.html b/help/l10n/en_US/ox.appsuite.user.index.html
index 1f3a7e7c2d6289caa33a0c00fab6cd538d355094..7deb6e80c4f3c4a6681c4b1273258ea4ff33ad9d 100644
--- a/help/l10n/en_US/ox.appsuite.user.index.html
+++ b/help/l10n/en_US/ox.appsuite.user.index.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="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing public keys">
 <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"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 </ul></div>
@@ -131,14 +131,6 @@
 <dt class="cap-webmail">collect from emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a>
 </dt>
 </dl></dd>
-<dt class="feat-io-ox-core-openai">AI functions, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a>
-</dt>
-<dd><dl>
-<dt class="feat-io-ox-core-openai">use for composing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a>
-</dt>
-<dt class="feat-io-ox-core-openai">use for email replies, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a>
-</dt>
-</dl></dd>
 <dt class="cap-calendar">An appointment's color, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a>
 </dt>
 <dt class="">App</dt>
@@ -160,11 +152,9 @@
 </dt>
 <dt class="">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">Adding attachments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a>
+<dt class="cap-calendar">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</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 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">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a>
 </dt>
@@ -200,6 +190,8 @@
 </dt>
 <dt class="cap-calendar">find free times, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
 </dt>
+<dt class="cap-calendar">forward appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Forwarding appointment invitations</a>
+</dt>
 <dt class="cap-calendar">Import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
 <dt class="cap-calendar">invite email recipients to new appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a>
@@ -212,6 +204,8 @@
 </dt>
 <dt class="cap-calendar">manage favorite time zones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite time zones</a>
 </dt>
+<dt class="feat-io-ox-core-categories">mark with categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</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>
@@ -247,6 +241,9 @@
 <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 cap-switchboard">appointments</dt>
+<dd><dl><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></dl></dd>
 <dt class="cap-guard">Autocrypt</dt>
 <dd><dl>
 <dt class="cap-guard">delete keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
@@ -275,15 +272,11 @@
 <dd><dl>
 <dt class="cap-calendar">add calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
 </dt>
-<dt class="cap-calendar">add personal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a>
-</dt>
 <dt class="cap-calendar">calendar view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">Day, Work week, Week, Month or Year calendar view.</a>
 </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">Creating appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating 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 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>
 </dt>
@@ -291,11 +284,11 @@
 </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 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">List view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">The Calendar list view</a>
+<dt class="feat-io-ox-core-categories">mark appointments with categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</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 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>
 </dt>
@@ -305,16 +298,31 @@
 </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>
 <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 Calendar 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="cap-calendar">add personal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a>
+</dt>
+<dt class="feat-io-ox-core-resourceCalendars">Creating appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating 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-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 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="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
@@ -322,9 +330,6 @@
 <dt class="feat-io-ox-core-resourceCalendars">Using Resource Calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</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="">Calendar settings</dt>
 <dd><dl>
 <dt class="cap-portal">advanced settings, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portal Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
@@ -384,8 +389,18 @@
 </dt>
 </dl></dd>
 <dt class="feat-io-ox-core-categories">Categories</dt>
-<dd><dl><dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
-</dt></dl></dd>
+<dd><dl>
+<dt class="feat-io-ox-core-categories">Categorizing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">mark appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">mark contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">mark tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a>
+</dt>
+</dl></dd>
 <dt class="cap-calendar">Change the appointment organizer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a>
 </dt>
 <dt class="cap-infostore">Cloud storage</dt>
@@ -395,10 +410,10 @@
 <dd><dl>
 <dt class="cap-contacts">add address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Books</a>
 </dt>
-<dt class="cap-contacts">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Adding 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-contacts">Adding attachments, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">Adding attachments</a>
+</dt>
 <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>
@@ -437,6 +452,8 @@
 </dt>
 <dt class="cap-contacts">manage, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
 </dt>
+<dt class="feat-io-ox-core-categories">mark with categories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a>
+</dt>
 <dt class="cap-contacts">move, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a>
 </dt>
 <dt class="cap-contacts">print, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Printing contacts</a>
@@ -486,7 +503,7 @@
 <dd><dl>
 <dt class="cap-contacts">export, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a>
 </dt>
-<dt class="cap-contacts">import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
+<dt class="cap-contacts">Import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 </dl></dd>
 <dt class="">Customized settings, <a class="indexterm" href="ox.appsuite.user.chap.settings.html">Customized Settings</a>
@@ -508,7 +525,7 @@
 </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>, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.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>
@@ -706,38 +723,14 @@
 </dt>
 <dt class="">email</dt>
 <dd><dl>
-<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-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-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="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</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-guard">send encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</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-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
-</dt>
-</dl></dd>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
-</dt>
-<dd><dl>
-<dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
-</dt>
 <dt class="cap-webmail">add attachments from existing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a>
 </dt>
-<dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a>
-</dt>
 <dt class="cap-webmail">add folder, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
 </dt>
 <dt class="cap-portal">add to portal, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a>
 </dt>
+<dt class="cap-webmail">Adding attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+</dt>
 <dt class="cap-webmail">archive, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a>
 </dt>
 <dt class="cap-webmail">assign color, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a>
@@ -748,117 +741,151 @@
 </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-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 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">display, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</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 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 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="feat-io-ox-core-mailPDFExport">export as PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a>
 </dt>
-<dt class="cap-webmail">filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a>
+<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">folder view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.foldertree.html">The Email folder view</a>
+<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">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 categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</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">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>
-<dt class="cap-webmail">mark as read, setting for, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
 <dt class="cap-webmail">mark as unread, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a>
 </dt>
 <dt class="cap-webmail">mark folder as read, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a>
 </dt>
+<dt class="feat-io-ox-core-categories">mark with categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a>
+</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 class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</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 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">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
+<dt class="cap-webmail">Recover, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a>
+</dt>
+<dt class="cap-dumpster">recover permanently deleted emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted 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">Selecting a sender address</a>
+<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>
 </dt>
-<dt class="cap-webmail">send, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">send, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a>
 </dt>
 <dt class="cap-webmail">send a vacation notice, <a class="indexterm" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a>
 </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 class="cap-infostore">send attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</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 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-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 class="feat-io-ox-core-scheduleSend">send later, <a class="indexterm" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</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 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-webmail">set reply-to addresses, <a class="indexterm" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</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 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 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">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The Email settings menu</a>
+<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">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.toolbar.html">The Email toolbar</a>
+<dt class="feat-io-ox-core-openai">use KI functions for composing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when composing emails</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 class="feat-io-ox-core-openai">use KI functions for replies, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</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 class="feat-io-ox-core-openai">use KI integration, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a>
 </dt>
-<dt class="feat-io-ox-core-openai">use AI functions for composing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a>
+<dt class="feat-io-ox-core-templates">use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a>
 </dt>
-<dt class="feat-io-ox-core-openai">use AI functions for replies, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a>
+<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="feat-io-ox-core-openai">use AI integration, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a>
+</dl></dd>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
 </dt>
-<dt class="cap-webmail">use draft, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a>
+<dd><dl>
+<dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a>
 </dt>
-<dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
+<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-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-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-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">inbox categories bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</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">mark as read, setting for, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="feat-io-ox-core-templates">use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
+<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">permanently delete, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting 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-webmail">save attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
+</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-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-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-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The Email 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 signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</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>
@@ -891,9 +918,9 @@
 </dt>
 <dt class="cap-webmail">append vcard, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">ask before replying to a mailing list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Ask before replying to a mailing list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">ask for mailto link registration, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Ask for mailto link registration, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">automatically collect contacts while reading, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -907,13 +934,13 @@
 </dt>
 <dt class="cap-webmail">fixed-width font, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">forward emails as, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Forward emails as, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">IMAP folder subscription, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a>
 </dt>
 <dt class="cap-webmail">insert the original email text to a reply, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">layout, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Layout, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">mark as read, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -923,11 +950,13 @@
 </dt>
 <dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="cap-webmail">permanently remove deleted emails, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Permanently remove deleted emails, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">reading pane, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">select newest read message automatically at start, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Select newest read message automatically at start, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="cap-webmail">show categories, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">show date and time, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -939,9 +968,9 @@
 </dt>
 <dt class="cap-webmail">show quoted text in different color, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">show requests for read receipts, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Show requests for read receipts, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">show text preview, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">Show text preview, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="cap-webmail">undo send, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -1293,20 +1322,17 @@
 <dt class="cap-tasks">import, task, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">import</dt>
+<dt class="cap-webmail">Import</dt>
 <dd><dl>
-<dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</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-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</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-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
+<dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
-</dl></dd>
-<dt class="cap-calendar">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-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</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-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>
@@ -1357,6 +1383,14 @@
 <dt class="cap-webmail">Keyboard navigation</dt>
 <dd><dl><dt class="cap-webmail">examples of use, <a class="indexterm" href="ox.appsuite.user.sect.keyboard.navigation.examples.html">Examples of use for the keyboard navigation</a>
 </dt></dl></dd>
+<dt class="feat-io-ox-core-openai">KI functions, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a>
+</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-openai">use for composing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when composing emails</a>
+</dt>
+<dt class="feat-io-ox-core-openai">use for email replies, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a>
+</dt>
+</dl></dd>
 </dl>
 </div>
 <div class="indexdiv">
@@ -1434,7 +1468,7 @@
 </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>
@@ -1446,9 +1480,9 @@
 </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 new emails</a>
 </dt>
-<dt class="cap-webmail">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
+<dt class="cap-webmail">email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
 </dt>
 <dt class="cap-contacts">personal address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a>
 </dt>
@@ -1458,7 +1492,7 @@
 </dt>
 <dt class="cap-tasks">task, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.create.html">Creating new tasks</a>
 </dt>
-<dt class="cap-tasks">task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a>
+<dt class="cap-tasks">task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a>
 </dt>
 <dt class="cap-infostore">text files, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
 </dt>
@@ -1613,6 +1647,13 @@
 <div class="indexdiv">
 <h3>R</h3>
 <dl>
+<dt class="cap-webmail">Recover</dt>
+<dd><dl>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a>
+</dt>
+<dt class="cap-dumpster">permanently deleted emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a>
+</dt>
+</dl></dd>
 <dt class="cap-infostore">Rename</dt>
 <dd><dl>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.rename.html">Editing file names</a>
@@ -1721,7 +1762,9 @@
 <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 new emails</a>
+</dt>
+<dt class="feat-io-ox-core-scheduleSend">email later, <a class="indexterm" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</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>
@@ -1791,10 +1834,10 @@
 </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-contacts">subscribe to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a>
-</dt>
 <dt class="cap-contacts">Subscribing to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared Drive folders</a>
 </dt>
+<dt class="cap-contacts">Subscribing to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a>
+</dt>
 <dt class="cap-infostore cap-share_links cap-share_mail_attachments">view in the Drive app, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.drive.html">Viewing or editing shares in the Drive app</a>
 </dt>
 </dl></dd>
@@ -1808,7 +1851,7 @@
 <dd><dl>
 <dt class="cap-contacts">address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a>
 </dt>
-<dt class="cap-share_links cap-share_mail_attachments">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a>
+<dt class="cap-share_links cap-share_mail_attachments">email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a>
 </dt>
 <dt class="cap-calendar_google">Google calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
 </dt>
@@ -1849,7 +1892,7 @@
 </dt>
 <dt class="cap-tasks">add personal task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adding personal task list</a>
 </dt>
-<dt class="cap-tasks">add task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a>
+<dt class="cap-tasks">add task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a>
 </dt>
 <dt class="cap-tasks cap-switchboard">call task participants, <a class="indexterm" href="ox.appsuite.user.sect.tasks.call.html">Calling Task Participants</a>
 </dt>
@@ -1877,7 +1920,7 @@
 </dt>
 <dt class="cap-tasks">folder view, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.foldertree.html">The Tasks folder view</a>
 </dt>
-<dt class="cap-tasks">import, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
+<dt class="cap-tasks">Import, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
 <dt class="cap-tasks">list view, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.list.html">The Tasks list view</a>
 </dt>
@@ -1885,6 +1928,8 @@
 </dt>
 <dt class="cap-tasks">mark as done, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a>
 </dt>
+<dt class="feat-io-ox-core-categories">mark with categories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a>
+</dt>
 <dt class="cap-tasks">move, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a>
 </dt>
 <dt class="cap-tasks">New task button, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.new.html">The New task button</a>
@@ -1899,7 +1944,7 @@
 </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-contacts">subscribe to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a>
+<dt class="cap-contacts">Subscribing to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a>
 </dt>
 <dt class="cap-tasks">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.settingsmenu.html">The Tasks settings menu</a>
 </dt>
@@ -1930,7 +1975,7 @@
 <div class="indexdiv">
 <h3>U</h3>
 <dl>
-<dt class="cap-webmail">unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
+<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-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>
@@ -1941,7 +1986,7 @@
 </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="feat-io-ox-core-templates">Use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
+<dt class="feat-io-ox-core-templates">use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a>
 </dt>
 <dt class="">Use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Use the notification area</a>
 </dt>
@@ -2001,7 +2046,7 @@
 </dt>
 <dt class="cap-contacts">export, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a>
 </dt>
-<dt class="cap-contacts">import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
+<dt class="cap-contacts">Import, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 <dt class="cap-contacts">send, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a>
 </dt>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.about.glossary.html b/help/l10n/en_US/ox.appsuite.user.sect.about.glossary.html
index 7e96c19a381ecd130c3ec104e96055c5b8b4dca5..3c40ed113bcec2974b01467f6c8dab66798ebd85 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.about.glossary.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.about.glossary.html
@@ -54,8 +54,8 @@
 <dd class="glossdef"><p role="presentation">An application is a groupware component that provides certain functions. Example: With the <span class="phrase">Email</span> application you can send, receive and organize emails.</p></dd>
 <dt class="feat-io-ox-core-categories" id="ox.appsuite.user.reference.about.glossary.categories"><span class="glossterm">Categories</span></dt>
 <dd class="glossdef feat-io-ox-core-categories">
-<p role="presentation">Categories can be used to classify appointments, contacts and tasks. That way, semantically related objects can be identified and easily found. Depending on the configuration, specific categories are predefined. You can set your own categories.</p>
-<p role="presentation">Note: Those categories can not be used for emails. For emails, there are inbox tabs.</p>
+<p role="presentation">Categories allow you to organize emails, appointments, contacts and tasks across apps, independently from the folder structure. This allows logically related objects to be identified and found more easily, for example all emails, appointments, contacts and tasks that belong to a specific project or customer. Depending on the configuration, specific categories are predefined. You can set your own categories.</p>
+<p role="presentation">Note: For emails, you can also use inbox tabs.</p>
 <p role="presentation">Related topics: <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.dataorganisation.categories.html">Managing Categories</a></p></li></ul></p>
 </dd>
 <dt class="cap-deputy" id="ox.appsuite.user.reference.about.glossary.deputy"><span class="glossterm">Deputy</span></dt>
@@ -152,11 +152,11 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.externalparticipant">External participant</a></p>
 </li></ul></p>
 </dd>
-<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Inbox tabs</span></dt>
+<dt class="cap-webmail" id="ox.appsuite.user.reference.about.glossary.inboxcategories"><span class="glossterm">Inbox categories</span></dt>
 <dd class="glossdef cap-webmail">
 <p role="presentation">Inbox tabs provide an easy and simple way of keeping the <span class="guilabel"><strong>Inbox</strong></span> folder neat. With tabs, incoming emails are saved separated by sender in the <span class="guilabel"><strong>Inbox</strong></span> folder. Depending on the configuration, specific inbox tabs are predefined. You can set additional inbox tabs according to your needs.</p>
 <p role="presentation">The inbox tabs can only be used in the <span class="guilabel"><strong>Inbox</strong></span> folder. If you need further storage options, use the folder view to create email folders.</p>
-<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox tabs described here can only be used for emails. Depending on the configuration, you can use separate categories for appointments, contacts and tasks.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails. Depending on the configuration, you can use separate categories for emails, appointments, contacts and tasks.</p>
 <p role="presentation">Related topics: <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.manage.inboxcategories.html">Working with inbox categories</a></p></li></ul></p>
 </dd>
 <dt class="feat-io-ox-core-managedResources" id="ox.appsuite.user.reference.about.glossary.managedresource"><span class="glossterm">Managed resource</span></dt>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.call.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.call.html
index c37d9adbbbce1657716b5a82f7b22558656ab87d..169b654a0b42f21791fcad881ed5bb3723111aa2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.call.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.call.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.call">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Calling Appointment Participants</h2></div></div></div>
-<a class="indexterm" name="id-1.8.13.2"></a><a class="indexterm" name="id-1.8.13.3"></a><a class="indexterm" name="id-1.8.13.4"></a><a class="indexterm" name="id-1.8.13.5"></a><a class="indexterm" name="id-1.8.13.6"></a><p id="ox.appsuite.user.concept.calendar.call">Learn how to call an appointment participant by contacting the appointment participant via audio or video conference or phone.</p>
+<a class="indexterm" name="id-1.8.14.2"></a><a class="indexterm" name="id-1.8.14.3"></a><a class="indexterm" name="id-1.8.14.4"></a><a class="indexterm" name="id-1.8.14.5"></a><a class="indexterm" name="id-1.8.14.6"></a><p id="ox.appsuite.user.concept.calendar.call">Learn how to call an appointment participant by contacting the appointment participant via audio or video conference or phone.</p>
 <p id="ox.appsuite.user.hint.calendar.call">Note: Depending on the configuration, this function might not be available.</p>
 <p id="ox.appsuite.user.precondition.calendar.call">Prerequisite: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
index c91e0c609d5daee7d6fdff990ad4bc3214a98cf9..4599acba88c16d68c592bdea575dae5ad2f28b9e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.deputy">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Creating, Editing or Managing Appointments as Deputy</h2></div></div></div>
-<a class="indexterm" name="id-1.8.18.2"></a><a class="indexterm" name="id-1.8.18.3"></a><p id="ox.appsuite.user.orientation.calendar.deputy">Learn how to act as another user’s <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. Depending on the permissions granted by this user, you can do the following in the user’s calendar: </p>
+<a class="indexterm" name="id-1.8.19.2"></a><a class="indexterm" name="id-1.8.19.3"></a><p id="ox.appsuite.user.orientation.calendar.deputy">Learn how to act as another user’s <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. Depending on the permissions granted by this user, you can do the following in the user’s calendar: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">view appointments</p></li>
 <li class="listitem"><p role="presentation">create new appointments on the user’s behalf</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html
index b3cce04e944c90a0e380186599d771fb3a968171..4183074d0e2ab58b43c25b0ab8b5e937f9645d9d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.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.calendar.html" title="Calendar">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responding to Appointment Invitations">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.forwardinvitation.html" title="Forwarding appointment invitations">
 <link rel="next" href="ox.appsuite.user.sect.calendar.call.html" title="Calling Appointment Participants">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.invitation.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.call.html">Next</a></li>
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.edit">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Editing Appointments</h2></div></div></div>
-<a class="indexterm" name="id-1.8.12.2"></a><a class="indexterm" name="id-1.8.12.3"></a><a class="indexterm" name="id-1.8.12.4"></a><a class="indexterm" name="id-1.8.12.5"></a><a class="indexterm" name="id-1.8.12.6"></a><p id="ox.appsuite.user.orientation.calendar.edit">Learn how to edit an appointment's data or time later.</p>
+<a class="indexterm" name="id-1.8.13.2"></a><a class="indexterm" name="id-1.8.13.3"></a><a class="indexterm" name="id-1.8.13.4"></a><a class="indexterm" name="id-1.8.13.5"></a><a class="indexterm" name="id-1.8.13.6"></a><p id="ox.appsuite.user.orientation.calendar.edit">Learn how to edit an appointment's data or time later.</p>
 <p id="ox.appsuite.user.concept.calendar.edit">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can edit all appointment data in the appointment's editing window.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
index db526e07c78850ed5d39318fcc01477da49b0c3b..316c92d061f33736653d6037f3c31bba50b7fcb2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.google">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to Google calendars</h3></div></div></div>
-<a class="indexterm" name="id-1.8.14.9.2"></a><a class="indexterm" name="id-1.8.14.9.3"></a><p id="ox.appsuite.user.concept.calendar.folder.google">Depending on the configuration, you can import your Google calendar’s appointments into a groupware calendar by subscribing to your Google calendar.</p>
+<a class="indexterm" name="id-1.8.15.9.2"></a><a class="indexterm" name="id-1.8.15.9.3"></a><p id="ox.appsuite.user.concept.calendar.folder.google">Depending on the configuration, you can import your Google calendar’s appointments into a groupware calendar by subscribing to your Google calendar.</p>
 <p id="ox.appsuite.user.hint.calendar.folder.google">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Appointment changes in Google calendars will be automatically synced to the Google calendar subscription after a short time.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
index a4a519f129105e75522c352aef30106293a26fd1..b98303ae774f2a6a27f1216f06ac141c2c2f9999 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
@@ -32,11 +32,11 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.folder">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Adding Calendars</h2></div></div></div>
-<a class="indexterm" name="id-1.8.14.2"></a><a class="indexterm" name="id-1.8.14.3"></a><p id="ox.appsuite.user.orientation.calendar.folder">With calendars you can organize your appointments e.g. by separately saving your business and private appointments. Learn how to create calendars, use appointments from external calendars and set the view for shared calendars.</p>
+<a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.folder">With calendars you can organize your appointments e.g. by separately saving your business and private appointments. Learn how to create calendars, use appointments from external calendars and set the view for shared calendars.</p>
 <p id="ox.appsuite.user.concept.calendar.folder">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.calendar.folder.personal.html">Adding personal calendars</a></p></li>
-<li class="listitem cap-calendar_google" id="id-1.8.14.5.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></p></li>
+<li class="listitem cap-calendar_google" id="id-1.8.15.5.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
index 885bf0e42044c7fa2aaffcbd31de9ef309096e41..12a6e439924b4027f47f9b094b204402c9570097 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.import">
 <div class="titlepage"><div><div><h3 class="title">Importing calendars from files</h3></div></div></div>
-<a class="indexterm" name="id-1.8.14.12.2"></a><a class="indexterm" name="id-1.8.14.12.3"></a><p id="ox.appsuite.user.concept.calendar.folder.import">You can import calendars that have been created from within other applications. The calendar you want to import needs to be available as iCal file.</p>
+<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.folder.import">You can import calendars that have been created from within other applications. The calendar you want to import needs to be available as iCal file.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.folder.import">
 <p class="title">How to import calendars from a file:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
index 359964f5eb2a3c7ce19953b71b420a7b3ea53547..825696bfe635c2788d16bdc042fc9d8a0e43a739 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.personal">
 <div class="titlepage"><div><div><h3 class="title">Adding personal calendars</h3></div></div></div>
-<a class="indexterm" name="id-1.8.14.8.2"></a><a class="indexterm" name="id-1.8.14.8.3"></a><p id="ox.appsuite.user.concept.calendar.folder.personal">You can create additional personal calendars below My calendars.</p>
+<a class="indexterm" name="id-1.8.15.8.2"></a><a class="indexterm" name="id-1.8.15.8.3"></a><p id="ox.appsuite.user.concept.calendar.folder.personal">You can create additional personal calendars below My calendars.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.folder.personal">
 <p class="title">How to create a new personal calendar:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribe.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribe.html
index d23b65436e5f6c25854f068bb7c584b49e03c095..3fef048a12dd94fa0911518621495ed7d3a1ea7d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribe.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribe.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.subscribe">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to external calendars from an iCal url</h3></div></div></div>
-<a class="indexterm" name="id-1.8.14.11.2"></a><a class="indexterm" name="id-1.8.14.11.3"></a><p id="ox.appsuite.user.concept.calendar.folder.subscribe">You can import appointments from external calendars into groupware calendars by subscribing to the external calendar. To do so, you need to know the calendar's iCal url.</p>
+<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.folder.subscribe">You can import appointments from external calendars into groupware calendars by subscribing to the external calendar. To do so, you need to know the calendar's iCal url.</p>
 <p id="ox.appsuite.user.hint.calendar.folder.subscribe">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Appointment changes in external calendars will be automatically synced to the calendar subscription after a short time.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html
index 7fdee91293239c2aaa75c23df1c7076db0999455..313291fae535c9b3a83a11cd41500938150a4152 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.subscribeshared">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to public and shared calendars</h3></div></div></div>
-<a class="indexterm" name="id-1.8.14.10.2"></a><a class="indexterm" name="id-1.8.14.10.3"></a><p id="ox.appsuite.user.concept.calendar.folder.subscribeshared">Calendars that are public or shared by other users can be used as follows: </p>
+<a class="indexterm" name="id-1.8.15.10.2"></a><a class="indexterm" name="id-1.8.15.10.3"></a><p id="ox.appsuite.user.concept.calendar.folder.subscribeshared">Calendars that are public or shared by other users can be used as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">You can define which public and shared groupware calendars are displayed in the folder view by subscribing to such calendars.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.forwardinvitation.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.forwardinvitation.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea563879ffb754ed5fb76ab854ff753d69f7d601
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.forwardinvitation.html
@@ -0,0 +1,77 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Forwarding appointment invitations</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">
+<link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responding to Appointment Invitations">
+<link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Editing Appointments">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.invitation.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.edit.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
+<div class="sect1" id="ox.appsuite.user.sect.calendar.forwardinvitation">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Forwarding appointment invitations</h2></div></div></div>
+<a class="indexterm" name="id-1.8.12.2"></a><p id="ox.appsuite.user.orientation.calendar.forwardinvitation">Learn how you as an appointment participant can invite other people to the appointment.</p>
+<p id="ox.appsuite.user.concept.calendar.forwardinvitation">Depending on the configuration, you even can invite other persons to an appointment if you are not the organizer of the appointment, but just a participant. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The person you invite gets an invitation email for this appointment.</p></li>
+<li class="listitem"><p role="presentation">As soon as the person replies to the invitation, the appointment’s organizer gets a message.</p></li>
+<li class="listitem"><p role="presentation">The appointment’s organizer decides whether the person will be added as appointment participant.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.calendar.forwardinvitation">
+<p class="title">How you as an appointment’s participant can invite other persons:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.forwardinvitation.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
+<li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>Send additional invitations</strong></span>.</p>
+<p role="presentation">If you selected an appointment of a series, the invitation will be sent for the whole series, not just for a single appointment of the series.</p>
+</li>
+<li class="step">
+<p role="presentation">In the <span class="guilabel"><strong>Send invitations</strong></span> window</p>
+<p role="presentation">Enter the participant’s email address, the name of a group or distribution list in <span class="guibutton"><strong>Add participant</strong></span>. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p></li>
+<li class="listitem">
+<p role="presentation">To select participants from an address book, click the <span class="guibutton"><strong>Select contacts</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.forwardinvitation.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> on the right side of the input field.</p>
+<p role="presentation">Note: Persons that are appointment participants already will not be displayed in the address book.</p>
+</li>
+</ul></p>
+<p role="presentation">You can enter a note that will be displayed in the email invitation.</p>
+</li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Send invitations</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.calendar.forwardinvitation"></p>
+<p class="title">User interface:</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.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p></li></ul>
+<p> </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.calendar.manage.changestatus.html">Changing appointment status</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.forwardinvitation">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
index fec634da7cdc5dc1a158456e83dee17c5831e9f8..165b3014b46ba715e29994302e21179cf3947eef 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.groups">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Groups</h2></div></div></div>
-<a class="indexterm" name="id-1.8.19.2"></a><p id="ox.appsuite.user.concept.calendar.groups">In case you frequently want to add the same persons to appointments or tasks, you can create a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.group">group</a> consisting of those persons. You can then add the group as participant instead of adding single persons. The following options exist: </p>
+<a class="indexterm" name="id-1.8.20.2"></a><p id="ox.appsuite.user.concept.calendar.groups">In case you frequently want to add the same persons to appointments or tasks, you can create a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.group">group</a> consisting of those persons. You can then add the group as participant instead of adding single persons. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create a new group</p></li>
 <li class="listitem"><p role="presentation">edit an existing group</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html
index 53d8938c00d5753fdb5737824bf99121d856fc1a..1a00f067831345c099a02e6099ea78c2911e393c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolve conflicts">
-<link rel="next" href="ox.appsuite.user.sect.calendar.edit.html" title="Editing Appointments">
+<link rel="next" href="ox.appsuite.user.sect.calendar.forwardinvitation.html" title="Forwarding appointment invitations">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.edit.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.forwardinvitation.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html
new file mode 100644
index 0000000000000000000000000000000000000000..a2043663f1a418cf528a36e96e1d825aa2166b1a
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -0,0 +1,68 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Marking appointments with categories</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">
+<link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Managing favorite time zones">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Using calendar colors">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
+<h2 class="sr-only">Managing Appointments</h2>
+<div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Marking appointments with categories</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><a class="indexterm" name="id-1.8.16.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">To organize appointments independently from calendars, you can mark contacts with categories.</p>
+<div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
+<p class="title">How to mark appointments with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>Edit appointment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the pop-up.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>Edit appointment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the toolbar.</p></li>
+</ul></p>
+<p role="presentation">The appointment editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select an existing category or create a new one.</p>
+<p role="presentation">In order to remove a category, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.calendar.manage.categories"></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.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.calendar.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index 213fa97924838da0764c5a09111122f537a35143..325beba2da2ec6ea362ae33f3ee71bdad2274868 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changeorganizer">
 <div class="titlepage"><div><div><h3 class="title">Changing the organizer</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.9.2"></a><a class="indexterm" name="id-1.8.15.9.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changeorganizer">If you are the organizer of an appointment or a recurring appointment with at least two participants, you can change the organizer. You can not change the organizer for the following appointments: </p>
+<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.calendar.manage.changeorganizer">If you are the organizer of an appointment or a recurring appointment with at least two participants, you can change the organizer. You can not change the organizer for the following appointments: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">an appointment with external participants</p></li>
 <li class="listitem"><p role="presentation">an individually changed appointment within a series</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
index 96960f2e07c08394d0fcbf4f0981ef5ead1003e4..32c4160f812d7c96315716c024d116bc166563fa 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changereminder">
 <div class="titlepage"><div><div><h3 class="title">Changing appointment reminders</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.8.2"></a><p id="ox.appsuite.user.concept.calendar.manage.changereminder">You can change your appointment reminder later by adjusting or removing a reminder or by adding another reminder.</p>
+<a class="indexterm" name="id-1.8.16.8.2"></a><p id="ox.appsuite.user.concept.calendar.manage.changereminder">You can change your appointment reminder later by adjusting or removing a reminder or by adding another reminder.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changereminder">Note: This function is only available if you do not have full edit permissions for the appointment. If this function is not available, you can change the appointment reminder by editing the appointment.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.changereminder">
 <p class="title">How to change an appointment reminder:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 976f5cc224cfb744f64ce9a60b83090b4b71291f..8fe08c50421f5af14f7eec4d4dd5e2a621be9510 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Changing appointment status</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.7.2"></a><a class="indexterm" name="id-1.8.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">You can change your appointment status at a later point of time. You can add a comment that is visible to other participants.</p>
+<a class="indexterm" name="id-1.8.16.7.2"></a><a class="indexterm" name="id-1.8.16.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">You can change your appointment status at a later point of time. You can add a comment that is visible to other participants.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Depending on the configuration, you can only edit an appointment confirmation in your private calendars if you are a participant of the appointment.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
index aa6e1407e81e02eb2d9a15bbb566cda6f0aa747b..6e83f3c02e286829695dd3795a0f3325468f51c8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.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.calendar.manage.html" title="Managing Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.timezones.html" title="Managing favorite time zones">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Marking appointments with categories">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Moving appointments to another calendar">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.move.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.colors">
 <div class="titlepage"><div><div><h3 class="title">Using calendar colors</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.11.2"></a><a class="indexterm" name="id-1.8.15.11.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">You can define a calendar color. By default, all appointments in this calendar will be displayed in the color of the calendar. If you assign an individual color to an appointment when creating or editing it, the appointment will be displayed in the color assigned, not in the color of the calendar.</p>
+<a class="indexterm" name="id-1.8.16.12.2"></a><a class="indexterm" name="id-1.8.16.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.colors">You can define a calendar color. By default, all appointments in this calendar will be displayed in the color of the calendar. If you assign an individual color to an appointment when creating or editing it, the appointment will be displayed in the color assigned, not in the color of the calendar.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">How to select a calendar color:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
index 1fef160bcc0d6b4fe23c374fcbeb7e99c0eaf5f8..034bf194d79bc9673b673bbc053a3fff4f407b76 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.16.2"></a><a class="indexterm" name="id-1.8.15.16.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted appointments can <span class="phrase"><strong>not</strong></span> be restored. Depending on the configuration, you can only delete an appointment in your private calendars if you are the appointment's organizer.</p>
+<a class="indexterm" name="id-1.8.16.17.2"></a><a class="indexterm" name="id-1.8.16.17.3"></a><p id="ox.appsuite.user.caution.calendar.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted appointments can <span class="phrase"><strong>not</strong></span> be restored. Depending on the configuration, you can only delete an appointment in your private calendars if you are the appointment's organizer.</p>
 <p id="ox.appsuite.user.concept.calendar.manage.delete">You can delete appointments from a calendar if you have the permission to delete items.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.delete">
 <p class="title">How to delete appointments:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
index 46c0bfe8dbf4183929e184d567b548758cc5ec17..c1192a4f7c1193596d8e107038fa56d5d38d5130 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.14.2"></a><a class="indexterm" name="id-1.8.15.14.3"></a><a class="indexterm" name="id-1.8.15.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">You can export appointments in the iCal format. You can e.g. use this format to exchange appointments with other calendar applications. You can export single appointments or all appointments from a calendar.</p>
+<a class="indexterm" name="id-1.8.16.15.2"></a><a class="indexterm" name="id-1.8.16.15.3"></a><a class="indexterm" name="id-1.8.16.15.4"></a><p id="ox.appsuite.user.concept.calendar.manage.export">You can export appointments in the iCal format. You can e.g. use this format to exchange appointments with other calendar applications. You can export single appointments or all appointments from a calendar.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.manage.export.selected">
 <p class="title">How to export single appointments:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -67,7 +67,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.calendar.manage.import.html">Importing appointments</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.8.15.14.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.8.16.15.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
index 5c9cf3d4b1d8f3b30fd806881a71dc91b079053a..67cbd7fc510079088b5e869e2328d5ef0ad72f12 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
@@ -32,12 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.manage">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Appointments</h2></div></div></div>
-<a class="indexterm" name="id-1.8.15.2"></a><a class="indexterm" name="id-1.8.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">Learn how to organize your appointments and about the appointment actions available. </p>
+<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.calendar.manage">Learn how to organize your appointments and about the appointment actions available. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing appointment status</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite time zones</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.16.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></p></li>
@@ -52,7 +53,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a></p>
 </li>
-<li class="listitem cap-deputy" id="id-1.8.15.5.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
+<li class="listitem cap-deputy" id="id-1.8.16.5.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.manage.parent">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
index 0ac1c805a01db66e4af85c0800c80cff008b10da..d06c186a76c485a340d5795baec9a00a11ca233f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.13.2"></a><a class="indexterm" name="id-1.8.15.13.3"></a><a class="indexterm" name="id-1.8.15.13.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">You can import appointments from files in iCal format.</p>
+<a class="indexterm" name="id-1.8.16.14.2"></a><a class="indexterm" name="id-1.8.16.14.3"></a><a class="indexterm" name="id-1.8.16.14.4"></a><p id="ox.appsuite.user.concept.calendar.manage.import">You can import appointments from files in iCal format.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.import">
 <p class="title">How to import appointments from an iCal file:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
index 9975b412ccfc08791305c480a1f5cb1991ecf2c4..4329aa6ac33f7a65df95614014366c0ac28cad81 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Moving appointments to another calendar</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.12.2"></a><a class="indexterm" name="id-1.8.15.12.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">You can move single appointments to another calendar, but no appointment series.</p>
+<a class="indexterm" name="id-1.8.16.13.2"></a><a class="indexterm" name="id-1.8.16.13.3"></a><p id="ox.appsuite.user.concept.calendar.manage.move">You can move single appointments to another calendar, but no appointment series.</p>
 <p>Prerequisite: You need to have the appropriate permissions to create objects in the target calendar.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.move">
 <p class="title">How to move appointments to another calendar:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
index 072de0e7fb85727bfef02433a5492b3da6a83659..e45cbeca9a1d8a641c7c88c5a4c2d4588e8c7624 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing appointments</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.15.2"></a><a class="indexterm" name="id-1.8.15.15.3"></a><a class="indexterm" name="id-1.8.15.15.4"></a><a class="indexterm" name="id-1.8.15.15.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">To print calendars and appointments you can: </p>
+<a class="indexterm" name="id-1.8.16.16.2"></a><a class="indexterm" name="id-1.8.16.16.3"></a><a class="indexterm" name="id-1.8.16.16.4"></a><a class="indexterm" name="id-1.8.16.16.5"></a><p id="ox.appsuite.user.concept.calendar.manage.print">To print calendars and appointments you can: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">print a calendar sheet with appointments</p></li>
 <li class="listitem"><p role="presentation">print an appointment's data</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html
index f5fde4af44ee23828bbdcff086d05dff2323b309..1bfcfc3ad702b953e3a784918476b8c693b067ee 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Changing the organizer">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.colors.html" title="Using calendar colors">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Marking appointments with categories">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.colors.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.timezones">
 <div class="titlepage"><div><div><h3 class="title">Managing favorite time zones</h3></div></div></div>
-<a class="indexterm" name="id-1.8.15.10.2"></a><a class="indexterm" name="id-1.8.15.10.3"></a><a class="indexterm" name="id-1.8.15.10.4"></a><p id="ox.appsuite.user.concept.calendar.manage.timezones">You can add multiple time zones to favorites. Those time zones can be shown in the calendar sheet in addition to the default time zone.</p>
+<a class="indexterm" name="id-1.8.16.10.2"></a><a class="indexterm" name="id-1.8.16.10.3"></a><a class="indexterm" name="id-1.8.16.10.4"></a><p id="ox.appsuite.user.concept.calendar.manage.timezones">You can add multiple time zones to favorites. Those time zones can be shown in the calendar sheet in addition to the default time zone.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.timezones.favorites">
 <p class="title">How to add a time zone to favorites:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
index ff5d04adcd5bb00ac847cb5d65470c87f7ae3234..422496264abfabdc028b0cb8bdce1ec23b0c8cc7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Managed Resources</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.managedresources.add">
 <div class="titlepage"><div><div><h3 class="title">Creating managed resources</h3></div></div></div>
-<a class="indexterm" name="id-1.8.21.6.2"></a><p id="ox.appsuite.user.concept.calendar.managedresources.add">If a resource is not yet to be booked when adding it to an appointment, but only after a booking delegate accepts the booking, create this resource as managed resource.</p>
+<a class="indexterm" name="id-1.8.22.6.2"></a><p id="ox.appsuite.user.concept.calendar.managedresources.add">If a resource is not yet to be booked when adding it to an appointment, but only after a booking delegate accepts the booking, create this resource as managed resource.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.managedresources.add">
 <p class="title">How to create a managed resource:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.administer.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.administer.html
index 57f3a395bd6734945cd5a2ead3330b535efd6280..7b81fdb28d20659d90d6916f24cb2b09f43d867b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.administer.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.administer.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Managed Resources</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.managedresources.administer">
 <div class="titlepage"><div><div><h3 class="title">Administrating managed resources as booking delegate</h3></div></div></div>
-<a class="indexterm" name="id-1.8.21.7.2"></a><p id="ox.appsuite.user.concept.calendar.managedresources.administer">If you are a booking delegate, you will get the following notifications if a user creates an appointment with a managed resource: </p>
+<a class="indexterm" name="id-1.8.22.7.2"></a><p id="ox.appsuite.user.concept.calendar.managedresources.administer">If you are a booking delegate, you will get the following notifications if a user creates an appointment with a managed resource: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You will be informed about the booking request in the notification area.</p></li>
 <li class="listitem"><p role="presentation">You will receive an email with a booking request.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
index 1062aced9c242727ed18f8b0d8ae599ffa65fe88..9659c595af3dd6e42be50b92c66352bd683e29b7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.managedresources">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Managed Resources</h2></div></div></div>
-<a class="indexterm" name="id-1.8.21.2"></a><a class="indexterm" name="id-1.8.21.3"></a><p id="ox.appsuite.user.concept.calendar.managedresources">In contrast to regular resources, a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.managedresource">managed resource</a> will only be booked if a resource delegate confirms the booking. The following options exist: </p>
+<a class="indexterm" name="id-1.8.22.2"></a><a class="indexterm" name="id-1.8.22.3"></a><p id="ox.appsuite.user.concept.calendar.managedresources">In contrast to regular resources, a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.managedresource">managed resource</a> will only be booked if a resource delegate confirms the booking. 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.calendar.managedresources.add.html">Creating managed resources</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.administer.html">Administrating managed resources as booking delegate</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
index 149c2161ee0fdd959a78907b417641faaa54046e..f3a4a8b62ed9cfd7902ffbc09f81746de14df3d5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Resource Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.resourcecalendar.add">
 <div class="titlepage"><div><div><h3 class="title">Creating resource calendars and resource calendar groups</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><a class="indexterm" name="id-1.8.16.9.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar.add">To create resource calendars, select resources from the resource list. </p>
+<a class="indexterm" name="id-1.8.17.9.2"></a><a class="indexterm" name="id-1.8.17.9.3"></a><a class="indexterm" name="id-1.8.17.9.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar.add">To create resource calendars, select resources from the resource list. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">For each resource, a resource calendar will be created.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.create.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.create.html
index bd62b68b22eddc711be5d37d715d5870c8572875..9ca2879853ee48e15fbae35bfbe5d3d17957d08c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.create.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Resource Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.resourcecalendar.create">
 <div class="titlepage"><div><div><h3 class="title">Creating appointments by using the resource calendar</h3></div></div></div>
-<a class="indexterm" name="id-1.8.16.12.2"></a><a class="indexterm" name="id-1.8.16.12.3"></a><a class="indexterm" name="id-1.8.16.12.4"></a><p id="ox.appsuite.user.possibilities.calendar.resourcecalendar.create">You can create an appointment by using a resource calendar. The resource calendar’s resource will automatically be added to the appointment.</p>
+<a class="indexterm" name="id-1.8.17.12.2"></a><a class="indexterm" name="id-1.8.17.12.3"></a><a class="indexterm" name="id-1.8.17.12.4"></a><p id="ox.appsuite.user.possibilities.calendar.resourcecalendar.create">You can create an appointment by using a resource calendar. The resource calendar’s resource will automatically be added to the appointment.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.resourcecalendar.create">
 <p class="title">How to create an appointment by using the resource calendar:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
index 8a742079bb425e3d5ca0a8f461f9e96b5c550fa9..5f3589266361e4cbae882fb317ef9e31af80b86a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Resource Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.resourcecalendar.edit">
 <div class="titlepage"><div><div><h3 class="title">Editing resource calendars</h3></div></div></div>
-<a class="indexterm" name="id-1.8.16.11.2"></a><p id="ox.appsuite.user.possibilities.calendar.resourcecalendar.edit">The following options exist: </p>
+<a class="indexterm" name="id-1.8.17.11.2"></a><p id="ox.appsuite.user.possibilities.calendar.resourcecalendar.edit">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">rename a resource calendar group</p></li>
 <li class="listitem"><p role="presentation">delete a resource calendar group</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
index 208fb81afdb1dcdf5909f92494062eea78acae3e..5ff3cd5f176606f55807f999a7610dc4e36cdee2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.resourcecalendar">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Resource Calendars</h2></div></div></div>
-<a class="indexterm" name="id-1.8.16.2"></a><a class="indexterm" name="id-1.8.16.3"></a><a class="indexterm" name="id-1.8.16.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar">To check whether a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> is available or has already been booked for an appointment, you can use resource calendars. </p>
+<a class="indexterm" name="id-1.8.17.2"></a><a class="indexterm" name="id-1.8.17.3"></a><a class="indexterm" name="id-1.8.17.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar">To check whether a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> is available or has already been booked for an appointment, you can use resource calendars. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">A resource calendar shows all appointments for which the resource has been booked.</p></li>
 <li class="listitem"><p role="presentation">You can create resource calenders by using the resource list.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
index 24db16f8f6e3ef261701821207a1d1d0450e4548..c92a449c57ff45d03c4f1f77a780c78030115ce6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Using Resource Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.resourcecalendar.view">
 <div class="titlepage"><div><div><h3 class="title">Displaying resource calendars</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.possibilities.calendar.resourcecalendar.view">To display appointments that are using specific resources, you have the following options: </p>
+<a class="indexterm" name="id-1.8.17.10.2"></a><a class="indexterm" name="id-1.8.17.10.3"></a><p id="ox.appsuite.user.possibilities.calendar.resourcecalendar.view">To display appointments that are using specific resources, you have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">display appointments in one or several resource calendar</p></li>
 <li class="listitem"><p role="presentation">display appointments of all resource calendars of a resource calendar group</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
index 642abcbf721eedf83f535b99addac74047702fdd..5782c0ffadf7a83fc5d388545664cdbb7585fc00 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.resources">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Resources</h2></div></div></div>
-<a class="indexterm" name="id-1.8.20.2"></a><p id="ox.appsuite.user.concept.calendar.resources">Other than participant conflicts, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> conflicts can not be ignored when creating appointments. If creating appointments, resources that are already booked for other appointments can not be added. The following options exist: </p>
+<a class="indexterm" name="id-1.8.21.2"></a><p id="ox.appsuite.user.concept.calendar.resources">Other than participant conflicts, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> conflicts can not be ignored when creating appointments. If creating appointments, resources that are already booked for other appointments can not be added. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create new resources</p></li>
 <li class="listitem"><p role="presentation">edit existing resources</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
index 9bdf5f5797432b0a90446842334aa683e23d90cd..fc40f6baf0f84e8c23c8073416475b3e7dd2a9f7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
@@ -32,10 +32,10 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.search">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Searching for Appointments</h2></div></div></div>
-<a class="indexterm" name="id-1.8.17.2"></a><a class="indexterm" name="id-1.8.17.3"></a><p id="ox.appsuite.user.orientation.calendar.search">Learn how to search for appointments: </p>
+<a class="indexterm" name="id-1.8.18.2"></a><a class="indexterm" name="id-1.8.18.3"></a><p id="ox.appsuite.user.orientation.calendar.search">Learn how to search for appointments: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">use search terms for title, location, description, participants</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.4.1.2"><p role="presentation">use search terms for a category or for multiple categories</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.18.4.1.2"><p role="presentation">use search terms for a category or for multiple categories</p></li>
 <li class="listitem"><p role="presentation">limit the search to a specific time frame</p></li>
 </ul>
 <p> You can use just one option or several options in any combination. All calendars will be searched.</p>
@@ -51,7 +51,7 @@
 <p role="presentation">In order to search the title and location, click on <span class="guibutton"><strong>Contains</strong></span> in the search menu. You can also press Enter.</p>
 <p role="presentation">Data that contain the search term will be searched for.</p>
 </li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.5.2.2.1.1.2">
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.18.5.2.2.1.1.2">
 <p role="presentation">This method is also used to search categories.</p>
 <p role="presentation">You can also search for appointments with an assigned category by clicking on the category in the pop-up or in the detail view of an appointment.</p>
 </li>
@@ -80,7 +80,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.calendar.view.views.html">Displaying appointments in different views</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
 </div>
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 76eab6e73051b7eac356434d5c1b21cca7a6f0ae..32a4011db9e6fd798ab92f17e0cdabe086444a76 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
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Calendar Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.8.22.2"></a><a class="indexterm" name="id-1.8.22.3"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.settings">
+<a class="indexterm" name="id-1.8.23.2"></a><a class="indexterm" name="id-1.8.23.3"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.calendar.settings">
 <p class="title">How to open the Calendar settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
@@ -47,8 +47,8 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.yourweek">Your week</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.reminder">Appointment reminders</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.8.22.5.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi meetings</a></p></li>
-<li class="listitem feat-zoom" id="id-1.8.22.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom meetings</a></p></li>
+<li class="listitem feat-jitsi" id="id-1.8.23.5.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi meetings</a></p></li>
+<li class="listitem feat-zoom" id="id-1.8.23.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom meetings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced">Advanced settings</a></p></li>
 </ul>
 <p> Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
@@ -56,15 +56,15 @@
 <h3 class="title">Your week</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime"><b>Working time. </b><a class="indexterm" name="id-1.8.22.6.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime"><b>Working time. </b><a class="indexterm" name="id-1.8.23.6.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.start"><b>Start. </b><a class="indexterm" name="id-1.8.22.6.2.1.1.1.3.1.1.1.2"></a>Defines the start of the working hours.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.end"><b>End. </b><a class="indexterm" name="id-1.8.22.6.2.1.1.1.3.1.2.1.2"></a>Defines the end of the working hours.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.interval"><b>Time scale. </b><a class="indexterm" name="id-1.8.22.6.2.1.1.1.3.1.3.1.2"></a>Specifies the interval for dividing the time grid in the <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span>, <span class="guibutton"><strong>Week</strong></span> calendar views.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.start"><b>start. </b><a class="indexterm" name="id-1.8.23.6.2.1.1.1.3.1.1.1.2"></a>Defines the start of the working hours.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.end"><b>end. </b><a class="indexterm" name="id-1.8.23.6.2.1.1.1.3.1.2.1.2"></a>Defines the end of the working hours.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.interval"><b>Time scale. </b><a class="indexterm" name="id-1.8.23.6.2.1.1.1.3.1.3.1.2"></a>Specifies the interval for dividing the time grid in the <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span>, <span class="guibutton"><strong>Week</strong></span> calendar views.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Work week. </b><a class="indexterm" name="id-1.8.22.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Work week. </b><a class="indexterm" name="id-1.8.23.6.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.start"><b>First day. </b>Defines the beginning of a work week.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.length"><b>Length. </b>Defines the number of days of a work week.</p></li>
@@ -74,7 +74,7 @@
 </ul>
 <p id="ox.appsuite.user.reference.calendar.settings.reminder"></p>
 <h3 class="title">Appointment reminders</h3>
-<p><a class="indexterm" name="id-1.8.22.7.2"></a>Defines default settings for new appointments. </p>
+<p><a class="indexterm" name="id-1.8.23.7.2"></a>Defines default settings for new appointments. </p>
 <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <p role="presentation">Default reminder when newly creating the following appointments: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -90,21 +90,21 @@
 <div id="ox.appsuite.user.reference.calendar.settings.jitsi" class="feat-jitsi">
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Jitsi meetings</h3>
-<p><a class="indexterm" name="id-1.8.22.9.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Jitsi Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.9.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
+<p><a class="indexterm" name="id-1.8.23.9.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Jitsi Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.23.9.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
 <p> See <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom"></p>
 <h3 class="title">Zoom meetings</h3>
-<p><a class="indexterm" name="id-1.8.22.10.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Zoom Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
+<p><a class="indexterm" name="id-1.8.23.10.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Zoom Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Appointments. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Always add a random meeting password. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.1.1.2"></a>Defines whether the conference will be secured by an automatically created password.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copy dial-in information to description. </b><a class="indexterm" name="id-1.8.22.10.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Always add a random meeting password. </b><a class="indexterm" name="id-1.8.23.10.3.3.1.1.2.1.1.1.2"></a>Defines whether the conference will be secured by an automatically created password.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>Automatically copy link to location. </b><a class="indexterm" name="id-1.8.23.10.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>Copy dial-in information to description. </b><a class="indexterm" name="id-1.8.23.10.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Dial-in numbers. </b>If you at least have a Zoom Pro account, Zoom offers dial-in numbers per country. To define the countries to be displayed in in appointment invitations, click on <span class="guibutton"><strong>Open Zoom profile</strong></span>.</p></li>
@@ -113,24 +113,24 @@
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings.advanced"></p>
 <h3 class="title">Advanced settings</h3>
-<p><a class="indexterm" name="id-1.8.22.11.2"></a></p>
+<p><a class="indexterm" name="id-1.8.23.11.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>show birthday calendar. </b><a class="indexterm" name="id-1.8.22.11.3.1.1.1.2"></a>Defines whether a birthday calendar is displayed in the folder view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>show reminders for past appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.2.1.2"></a>Defines whether appointment reminders are displayed for past  appointments.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>show birthday calendar. </b><a class="indexterm" name="id-1.8.23.11.3.1.1.1.2"></a>Defines whether a birthday calendar is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>Show reminders for past appointments. </b><a class="indexterm" name="id-1.8.23.11.3.1.2.1.2"></a>Defines whether appointment reminders are displayed for past  appointments.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.8.22.11.3.1.3.1.2"></a>Defines in which cases appointment invitations by external contacts automatically will be added to your calendar. </p>
+<p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.8.23.11.3.1.3.1.2"></a>Defines in which cases appointment invitations by external contacts automatically will be added to your calendar. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Never</strong></span>. The appointment change will not be applied automatically. The email invitation includes a button for adding the appointment to your calendar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Only from known senders</strong></span>. The appointment change will be applied automatically if the appointment change comes from a sender who is entered as appointment participant or is entered as a contact in one of your address books.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Always</strong></span>. The appointment change will always be automatically added to your calendar.</p></li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Show free/busy information to others. </b><a class="indexterm" name="id-1.8.22.11.3.1.4.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Subscribe to shared calendars. </b><a class="indexterm" name="id-1.8.22.11.3.1.5.1.2"></a>See <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Show declined appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.6.1.2"></a>Defines whether appointments that you declined are displayed. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.7.1.2"></a>Defines whether participants by default get the permission to edit an appointment.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Automatically mark all day appointments as “free” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.8.1.2"></a>Defines whether all day appointments are displayed as free by default.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.22.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>use first category color for appointments. </b><a class="indexterm" name="id-1.8.22.11.3.1.9.1.2"></a>Defines whether appointments to which you have assigned a category are displayed in the color of that category. When assigning multiple categories to an appointment, the color of the initially assigned category will be used. See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Show free/busy information to others. </b><a class="indexterm" name="id-1.8.23.11.3.1.4.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Subscribe to shared calendars. </b><a class="indexterm" name="id-1.8.23.11.3.1.5.1.2"></a>See <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Show declined appointments. </b><a class="indexterm" name="id-1.8.23.11.3.1.6.1.2"></a>Defines whether appointments that you declined are displayed. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.23.11.3.1.7.1.2"></a>Defines whether participants by default get the permission to edit an appointment.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Automatically mark all day appointments as “free” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.23.11.3.1.8.1.2"></a>Defines whether all day appointments are displayed as free by default.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.23.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>use first category color for appointments. </b><a class="indexterm" name="id-1.8.23.11.3.1.9.1.2"></a>Defines whether appointments to which you have assigned a category are displayed in the color of that category. When assigning multiple categories to an appointment, the color of the initially assigned category will be used. See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
index 7fbb3243f433866d9dc18f2cbdc0b0f0290821d6..4fc698174e914d7868ee739013365644e40dad6e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -43,7 +43,7 @@
 <p role="presentation">If entered: title, business information, residence</p>
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.9.7.11.4.1.3">
-<p role="presentation">The categories assigned</p>
+<p role="presentation">the categories assigned</p>
 <p role="presentation">Clicking a category searches for contacts assigned to that category.</p>
 </li>
 <li class="listitem cap-switchboard" id="id-1.9.7.11.4.1.4"><p role="presentation">Depending on the configuration: the contact's current availability for calls</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html
new file mode 100644
index 0000000000000000000000000000000000000000..f94463fb563e1f798f0a1e916d605236a38fa19e
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -0,0 +1,65 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Marking contacts with categories</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">
+<link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Inviting contacts to an appointment">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Moving or copying contacts">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
+<h2 class="sr-only">Managing Contacts</h2>
+<div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Marking contacts with categories</h3></div></div></div>
+<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">To organize contacts independently from address books, you can mark contacts with categories.</p>
+<div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
+<p class="title">How to mark contacts with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Select a contact. Click the <span class="guibutton"><strong>Edit contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">The contact editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select an existing category or create a new one.</p>
+<p role="presentation">In order to remove a category, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.contacts.manage.categories"></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.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.contacts.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.delete.html
index 8d52ce8c9758cf0c0a203147ecab369f89d64888..75b656efdba5163cd474d4f3fbb36d861b4bd49e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted contacts and distribution lists can <span class="phrase"><strong>not</strong></span> be restored.</p>
+<a class="indexterm" name="id-1.9.17.15.2"></a><a class="indexterm" name="id-1.9.17.15.3"></a><p id="ox.appsuite.user.caution.contacts.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted contacts and distribution lists can <span class="phrase"><strong>not</strong></span> be restored.</p>
 <p id="ox.appsuite.user.concept.contacts.manage.delete">You can delete contacts or distribution lists from an address book if you have the permission to delete items from this address book. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can not delete contacts from the <span class="guibutton"><strong>All users</strong></span> address book.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.export.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.export.html
index f25c42d7b727835829acc9e53737acf537b38952..cd6256e9e3979baedd39d2685b2dcbea7c5e2875 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.export.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">You can export contacts or distribution lists to those formats: </p>
+<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><a class="indexterm" name="id-1.9.17.13.4"></a><a class="indexterm" name="id-1.9.17.13.5"></a><p id="ox.appsuite.user.concept.contacts.manage.export">You can export contacts or distribution lists to those formats: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">vCard. You can e.g. use this format to exchange contacts with other email applications.</p></li>
 <li class="listitem"><p role="presentation">CSV You can use this format to export contacts to spreadsheet formats.</p></li>
@@ -79,7 +79,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.9.17.12.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.9.17.13.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
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 40a12b4e6356a3a3ca733fe1e0beed07d59fb908..3425be6b5133091faa0627ec6eefcec477f7ec25 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
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><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 cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.import.html
index 7ff2996e205ae5053f798c44a850a699dda5b16c..8bd05209908c07ea2cca2774c07211295d9a689d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><a class="indexterm" name="id-1.9.17.11.5"></a><a class="indexterm" name="id-1.9.17.11.6"></a><a class="indexterm" name="id-1.9.17.11.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">You can import contacts from files that have the following formats: </p>
+<a class="indexterm" name="id-1.9.17.12.2"></a><a class="indexterm" name="id-1.9.17.12.3"></a><a class="indexterm" name="id-1.9.17.12.4"></a><a class="indexterm" name="id-1.9.17.12.5"></a><a class="indexterm" name="id-1.9.17.12.6"></a><a class="indexterm" name="id-1.9.17.12.7"></a><p id="ox.appsuite.user.concept.contacts.manage.import">You can import contacts from files that have the following formats: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">vCard. Notes: </p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index ff3a20a9f952c744ec098c3b31602eca77186a6a..6cfe7b2abfa87876fbb1f71392cee58f5f2e5027 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Sending emails from within an address book">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.movecopy.html" title="Moving or copying contacts">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Marking contacts with categories">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html
index b2f6f03f8759fe4db864452b874fbba4ca858a41..6d66135fb3ecfacd9fd5c2867f5624a6242c631c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.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.contacts.manage.html" title="Managing Contacts">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html" title="Inviting contacts to an appointment">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Marking contacts with categories">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Sending contacts as vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.movecopy">
 <div class="titlepage"><div><div><h3 class="title">Moving or copying contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><a class="indexterm" name="id-1.9.17.9.4"></a><a class="indexterm" name="id-1.9.17.9.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">You can move or copy contacts or distribution lists to another address book.</p>
+<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><a class="indexterm" name="id-1.9.17.10.5"></a><p id="ox.appsuite.user.concept.contacts.manage.movecopy">You can move or copy contacts or distribution lists to another address book.</p>
 <p id="ox.appsuite.user.hints.contacts.manage.movecopy">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can not move or copy contacts or distribution lists to the <span class="guibutton"><strong>All users</strong></span> address book.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.print.html
index 752d81ea21c49840a3b6cebe2ce98430b5354b76..5ff5760a9cfc74b103058fd5835d47bb1ab1c421 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing contacts</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.13.2"></a><a class="indexterm" name="id-1.9.17.13.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">You can print the data of a single contact or of multiple contacts. You can select between different print layouts.</p>
+<a class="indexterm" name="id-1.9.17.14.2"></a><a class="indexterm" name="id-1.9.17.14.3"></a><p id="ox.appsuite.user.concept.contacts.manage.print">You can print the data of a single contact or of multiple contacts. You can select between different print layouts.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.print.list">
 <p class="title">How to print a contact's data:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendmail.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendmail.html
index 010e9ad48fcdbfa87d6383c9593b33928b074915..e7874cac2eebbf333103f24a82721aec41a9c974 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendmail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendmail.html
@@ -51,7 +51,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.gui.toolbar.html">The <span class="phrase">Address Book</span> toolbar</a></p></li></ul>
 <p> </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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendmail">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendvcard.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendvcard.html
index 7232a3a7527aac92e5745947788be813305b2d04..9b1ab44311293923c0ecc7d22f1ec9af104c9516 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendvcard.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.sendvcard.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.sendvcard">
 <div class="titlepage"><div><div><h3 class="title">Sending contacts as vCard</h3></div></div></div>
-<a class="indexterm" name="id-1.9.17.10.2"></a><a class="indexterm" name="id-1.9.17.10.3"></a><a class="indexterm" name="id-1.9.17.10.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">You can send contacts or distribution lists as vCard attachment to an email.</p>
+<a class="indexterm" name="id-1.9.17.11.2"></a><a class="indexterm" name="id-1.9.17.11.3"></a><a class="indexterm" name="id-1.9.17.11.4"></a><p id="ox.appsuite.user.concept.contacts.manage.sendvcard">You can send contacts or distribution lists as vCard attachment to an email.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.sendvcard">
 <p class="title">How to send a contact as vCard attachment:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -49,7 +49,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.contacts.manage.export.html">Exporting contacts</a></p></li>
-<li class="listitem cap-webmail" id="id-1.9.17.10.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem cap-webmail" id="id-1.9.17.11.7.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.sendvcard">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
index 3eec4faae87a3db4cb0529f502bd237a604625e5..aa04cb4bb03d0e004fbee153daf50f055c904a0a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
@@ -81,7 +81,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.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.18.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">Address Book</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressbook.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressbook.html
index 4b476859128f979724efe7880a24ce726feb62bb..8655eb3962035f19337ddb94e23b99018340e2b3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressbook.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressbook.html
@@ -65,7 +65,7 @@
 <p> </p>
 <p class="title">Superordinate 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.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creating managed resources</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressdirectory.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressdirectory.html
index df377bb44f7e1d9fd172c8d22124b8efe394943d..75545856afa2a869cd3ed81a897808def7d023ab 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressdirectory.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.useaddressdirectory.html
@@ -72,7 +72,7 @@
 <p id="ox.appsuite.user.related.contacts.useaddressdirectory"></p>
 <p class="title">Superordinate 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.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.participants.html">Adding participants or resources</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p>
 <p role="presentation" class="feat-io-ox-core-managedResources"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creating managed resources</a></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 335105a952bf3494b52438d8e9a1dc68a5b975e8..83be49b93140d2a292f8eefdd8df528874ba061e 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
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.customize.addsocial.html">Adding a Portal widget for social networks</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p>
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
index f03302750805d0b4622db72dffe923df610a1925..81b35b532c0d344a44e0e73375d74c420ed955ef 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts.functionalmail">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.html
index 4dcfe3a52af195ff0bbe3d29f730ba7dde32589d..2b429b1c57021f7523b7fbf93fefe0abbf4f8d8f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.html
@@ -32,15 +32,15 @@
   <h1 class="sr-only">Data Organization and Shares</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Categories</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to manage <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to classify appointments, contacts and tasks. Categories have the following properties: </p>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to manage <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to organize emails, appointments, contacts and tasks across apps, independently from the folder structure. You e.g. can use an own category for a specific project or customer. Categories have the following properties: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">A category consists of a name and a color.</p></li>
 <li class="listitem"><p role="presentation">When searching for objects, you can use categories as search terms.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration, specific categories are predefined. Such categories can neither be edited nor deleted.</p></li>
 <li class="listitem"><p role="presentation">You can create, edit and delete own categories.</p></li>
-<li class="listitem"><p role="presentation">You can assign a category or several categories to appointments, contacts and tasks and delete them later.</p></li>
+<li class="listitem"><p role="presentation">You can assign a category or several categories to emails, appointments, contacts and tasks and delete them later.</p></li>
 </ul>
-<p> Note: Those categories can not be used for emails. For emails, there are the inbox categories, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
+<p> Note: For emails, you can also use inbox tabs. A specific inbox category can be assigned to an email. The category depends on the sender, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.categories">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create an own category</p></li>
@@ -51,9 +51,15 @@
 <p class="title">How to manage your categories:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step help-hide-inline">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> on the right side of the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane. Click on <span class="guibutton"><strong>Manage categories</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span>.</p>
+<p role="presentation">You can also use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Select an email. Click the <span class="guibutton"><strong>Add category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the toolbar. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p></li>
+<li class="listitem">
 <p role="presentation">Open the editing window for appointments, contacts or tasks by creating or editing an appointment, a contact or a task.</p>
 <p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">You can also use the <span class="guibutton"><strong>Manage categories</strong></span> button in the general settings below <span class="guibutton"><strong>Advanced settings</strong></span>.</p></li></ul>
+</li>
+</ul></p>
 <p role="presentation">The <span class="guilabel"><strong>Manage categories</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -68,21 +74,12 @@
 <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" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.add.create.html">Creating new tasks</a></p>
-</li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.edit.html">Editing Contacts or Distribution Lists</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></p></li>
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p>
-</li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">Parent topic: <a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</i></a></p>
 </div>
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 e3d880d1c8ad5b73c5e892a7b2d4285ebb61ddf9..ff2f9edc7f6de44657f87d14968758b0f1fce6e4 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
@@ -80,7 +80,7 @@
 <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">Adding Address Books</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</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>
 <p id="ox.appsuite.user.parent.dataorganisation.folder">Parent topic: <a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</i></a></p>
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 12b8046ac8c356234cd1df508231a4de9f3fe9e3..7726daf511a6c785341ec8740631c939728dc15e 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
@@ -37,7 +37,7 @@
 <p class="title">The following options exist:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Email folders </p>
+<p role="presentation">email folders </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">The <span class="guibutton"><strong>Inbox</strong></span> folder as well as all folders and subfolders in <span class="guibutton"><strong>My folders</strong></span> can be shared with internal users with read permissions.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html b/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
index 6bcd46bb33ec263a2f8588a94054442cdef7489b..5a89981d53e21b62951b40acabb7e8c9b333127f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
@@ -71,7 +71,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.email.manage.unifiedmail.html">Using Unified Mail</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</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.replyto.html">Setting reply-to address</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
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 baf3f8f6b6bbb3227612a6942c59387a5bf78188..c67945f74f9dfd1bc49a0cab9f961d40210696ed 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
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Email">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Viewing Emails">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <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.email.call.html b/help/l10n/en_US/ox.appsuite.user.sect.email.call.html
index feb74ac1071964bb4ad589981b7bee0bc2171988..38856c48327d81fe9e310f30331aaf370a54fd3a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.call.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.call.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.email.html" title="Email">
-<link rel="prev" href="ox.appsuite.user.sect.email.openai.send.html" title="Using AI functions when composing emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.openai.send.html" title="Using KI functions when composing emails">
 <link rel="next" href="ox.appsuite.user.sect.email.folder.html" title="Adding Email Folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
index 379f603b20a7326f8b9b326c8f85e624cdec9ee6..f36d1998c92db381c4d65775a80739c25ce6d33c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
@@ -86,7 +86,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.email.send.html">Sending Emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
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 c1f3b1549a4044b907d8f6c6fedbf7c9e5d6e111..5192a23726127e681e4638ac5a705d76ad37063c 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
@@ -55,7 +55,7 @@
 </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>
 <li class="listitem">
-<p role="presentation"><span class="guibutton"><strong>RE</strong></span> button. Opens the <span class="guibutton"><strong>Reply to</strong></span> input field.</p>
+<p role="presentation"><span class="guibutton"><strong>AW</strong></span> button. Opens the <span class="guibutton"><strong>Reply to</strong></span> input field.</p>
 <p role="presentation">Your email reply will be sent to the email addresses entered in this input field.</p>
 </li>
 <li class="listitem">
@@ -76,6 +76,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Send</strong></span>. Sends the email to the recipients entered.</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.13.5.1.5"><p role="presentation"><span class="guibutton"><strong>Send later</strong></span>. Opens a menu that allows you to select when the email should be sent.</p></li>
 <li class="listitem">
 <p role="presentation">Button bar </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -110,10 +111,11 @@
 <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.detailview.html">The <span class="phrase">Email</span> detail view</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<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.send.new.html">Sending new emails</a></p>
+<p role="presentation" class="feat-io-ox-core-scheduleSend"><a class="xref" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
-<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></p>
+<p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when composing emails</a></p>
 <p role="presentation" class="cap-deputy"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a></p>
 </li>
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 096d31c5d7e91b6ec63ddbdd31b3ef8bd9ff101c..115ac254fb7dd68ebca8b0889ba044625ad1c036 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
@@ -72,6 +72,7 @@
 </ul>
 </li>
 <li class="listitem"><p role="presentation">If selecting an email with an attachment as link in the <span class="guibutton"><strong>Sent</strong></span> folder, information about the attachment will be displayed at the top of the email text.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: If available, the assigned categories will be displayed.</p></li>
 <li class="listitem">
 <p role="presentation">E-Mail text</p>
 <p role="presentation">Quotes from previous emails are marked at the beginning of the line.</p>
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 cb9165e7fea5bf30f649c683ea6c942307cc8e17..cf22a40e5199ca7e89fc5c81dee3bd9bd959743f 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
@@ -40,14 +40,16 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Inbox</strong></span>. Per default, all incoming emails go to this folder.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Drafts</strong></span>. Contains the emails saved as draft.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sent</strong></span>. Contains the email sent by you.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sent</strong></span>. Contains the emails sent by you.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Trash</strong></span>. Contains the email deleted by you.</p></li>
 <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 and email 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">Folder for flagged messages</p></li>
+<li class="listitem"><p role="presentation">Folder for unread messages</p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.8.7.5.2.3"><p role="presentation">Folder for messages that will be sent later</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>
@@ -61,6 +63,9 @@
 <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.html">Email Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></p>
+<p role="presentation" class="cap-dumpster"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted 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.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.html
index 98c6a80c992fcf7d2f4ace2af6fdc59dc1e24d1d..1f9d48dbcc3be3dfd06df68911df9a21226817d6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.html
@@ -38,7 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></p></li>
 <li class="listitem"><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></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">Email</span> toolbar</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">Email</span> tabs bar</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></p></li>
 <li class="listitem"><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></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">Email</span> detail view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.popup.html">The <span class="phrase">Email</span> pop-up</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
index 19146600d993527f4c844148c1a0ea46a5322b61..b40bee67bd792d3da69d9fc8562651de0dffe219 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.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.email.gui.html" title="The Email Components">
-<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The Email tabs bar">
+<link rel="prev" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The inbox categories bar">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.detailview.html" title="The Email detail view">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -45,6 +45,7 @@
 <li class="listitem"><p role="presentation">The following details are displayed for each email: Sender, subject, date of receipt. Unread E-Mails are marked with the <span class="guibutton"><strong>Unread</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">A tooltip on a sender's name shows the sender's email address.</p></li>
 <li class="listitem"><p role="presentation">If available, additional information is shown: attachment icons, colored label or flag, number of emails in a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversation</a>, priority.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.10.5.1.7"><p role="presentation">If available, the assigned categories will be displayed. In the E-Mail settings, you can specify whether assigned categories are displayed in the list view.</p></li>
 <li class="listitem"><p role="presentation">Encrypted emails are marked with the Encrypted icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">If a vacation notice is enabled, a notification will be displayed above the list view.</p>
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 6cf718c552c33666a2fa0127a2c37c2ffca49a83..4ee45261798ff3fbbb0d3390047375b0850ea5ac 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
@@ -46,7 +46,8 @@
 <p> </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.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
+<p role="presentation" class="feat-io-ox-core-scheduleSend"><a class="xref" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></p>
 </li></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
index 5c42584a1c8fcfae5348c72d738a593dd4c00182..83f9f0fa76f4c53ade0cf1bbb521656cb4e6950a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>The Email tabs bar</title>
+<title>The inbox categories bar</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,13 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <h2 class="sr-only">The <span class="phrase">Email</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.tabs">
-<div class="titlepage"><div><div><h3 class="title">The <span class="phrase">Email</span> tabs bar</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">The inbox categories bar</h3></div></div></div>
 <a class="indexterm" name="id-1.7.8.9.2"></a><p id="ox.appsuite.user.concept.email.gui.tabs">Shows predefined inbox tabs for the emails in the <span class="guibutton"><strong>Inbox</strong></span> folder. This allows you to assign incoming emails to certain tabs sorted by senders.</p>
 <p id="ox.appsuite.user.reference.email.gui.tabs"></p>
 <p class="title">Notes:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Depending on the configuration, inbox tabs might not be available.</p></li>
-<li class="listitem"><p role="presentation">If inbox tabs are available, you can show or hide the inbox tab bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">If inbox categories are available, you can show or hide the inbox categories bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">The number of inbox tabs and their names and order are preset. Depending on the configuration, some inbox tabs can be renamed or disabled.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
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 abbf769f118be4f46b23c8954e6bf88eaab058f9..47bed74753e2cdf942d5a060b0af331ec42ff7d9 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
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.gui.html" title="The Email Components">
 <link rel="prev" href="ox.appsuite.user.sect.email.gui.foldertree.html" title="The Email folder view">
-<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The Email tabs bar">
+<link rel="next" href="ox.appsuite.user.sect.email.gui.tabs.html" title="The inbox categories bar">
 <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,8 +40,9 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>. Deletes the emails selected by you.</p></li>
 <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 feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>AI integration</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Opens a menu with AI functions for editing the email content.</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 feat-io-ox-core-openai" id="id-1.7.8.8.4.1.5"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>AI integration</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.openai"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span>. Opens a menu with KI functions for editing the email content.</p></li>
+<li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set inbox category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.inboxcategories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opens a menu that allows you to move an email to an inbox 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 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/tags.svg" height="15"></object></span>. Opens a menu with functions for assigning a category or for managing categories.</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>
@@ -53,15 +54,16 @@
 <p> </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.tabs.html">The <span class="phrase">Email</span> tabs bar</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.8.8.5.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
index fc25b4b8586e4533d69da8190ed278606bec8449..efa5c53c91432d78fd9291210ebcdf087ebb0c9c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.addportal">
 <div class="titlepage"><div><div><h3 class="title">Adding an email to the Portal</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.15.2"></a><a class="indexterm" name="id-1.7.15.15.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">You can add an email as widget to the Portal.</p>
+<a class="indexterm" name="id-1.7.15.16.2"></a><a class="indexterm" name="id-1.7.15.16.3"></a><p id="ox.appsuite.user.concept.email.manage.addportal">You can add an email as widget to the Portal.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.addportal">
 <p class="title">How to add an email to the portal:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
index 0d5832405f6d03d1f43a3a0fa762a2fd5688799b..4501ae4fa9a5b0950728381da98c31eb27dcf94b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiving emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving emails, those emails are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived emails are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options exist: </p>
+<a class="indexterm" name="id-1.7.15.21.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving emails, those emails are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived emails are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archive a folder's emails that are older than 90 days</p></li>
 <li class="listitem"><p role="presentation">archive single emails</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html
new file mode 100644
index 0000000000000000000000000000000000000000..6577b404a24585b09d93d77ad5380ead0afbbd82
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html
@@ -0,0 +1,69 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Marking emails with categories</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">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecting addresses">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorizing emails">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Managing Emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Marking emails with categories</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">To organize emails independently from folders, you can mark emails with categories.</p>
+<p id="ox.appsuite.user.tip.email.manage.categories">Independently from categories, you can use inbox categories. With inbox categories, you can organize emails related to senders, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.categories">
+<p class="title">How to mark emails with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select one or several emails.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Assign category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.add"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the toolbar. Select at least one category.</p>
+<p role="presentation">To remove an assigned category, click on it.</p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>In order to create, edit or delete a category, click on <span class="guibutton"><strong>Manage categories</strong></span>.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.categories"></p>
+<p class="title">User interface:</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.toolbar.html">The <span class="phrase">Email</span> toolbar</a></p></li></ul>
+<p> </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.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
index 3fa03b4de5363a3a3c694e315b6c36b425ec7627..77cca4e700286c30db3602290625bcd1f4ec27bf 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marking emails as read or unread">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.label.html" title="Categorizing emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Marking emails with categories">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.mark.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.label.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
index dc6a107698732f5eae7d8671550f13a7519af0ad..00dbbdeefd15d987abe616107dcab6cdbcbfbf6e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.archive.html" title="Archiving emails">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Cleaning up email folders">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recovering emails">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.archive.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.recover.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,20 +33,20 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.21.2"></a><a class="indexterm" name="id-1.7.15.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options exist: </p>
+<a class="indexterm" name="id-1.7.15.22.2"></a><a class="indexterm" name="id-1.7.15.22.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">Define whether emails are moved to the Trash or permanently removed when deleted.</p>
-<p role="presentation">Emails that are moved to the trash, can be recovered.</p>
+<p role="presentation">You can define whether emails are moved to the Trash or permanently removed when deleted. </p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p role="presentation">Emails that are moved to the trash, can be recovered.</p></li>
+<li class="listitem"><p role="presentation"><span class="cap-dumpster">Permanently deleted emails can be recovered within 14 days. After this period has expired: </span> Permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p></li>
+</ul>
 </li>
-<li class="listitem"><p role="presentation">Delete individual emails or entire email conversations.</p></li>
-<li class="listitem"><p role="presentation">Delete all emails of an email folder.</p></li>
-<li class="listitem"><p role="presentation">Recover emails from the trash.</p></li>
-<li class="listitem"><p role="presentation">Permanently delete emails from the trash.</p></li>
-<li class="listitem"><p role="presentation">Permanently delete all emails from the trash by emptying the trash.</p></li>
+<li class="listitem"><p role="presentation">You can delete single emails or an entire conversation.</p></li>
+<li class="listitem"><p role="presentation">You can delete all emails of an email folder.</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.delete.setting">
-<p class="title">How to define whether emails are moved to the trash or permanently removed when deleted.</p>
+<p class="title">How to define whether emails are moved to the trash or permanently removed when deleted:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.setting"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
@@ -60,21 +60,21 @@
 <li class="listitem"><p role="presentation">If emails are to be moved to the trash, disable <span class="guibutton"><strong>Permanently remove deleted emails</strong></span>.</p></li>
 <li class="listitem">
 <p role="presentation">If emails are to be deleted permanently, enable <span class="guibutton"><strong>Permanently remove deleted emails</strong></span>.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Depending on the configuration, permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p>
 </li>
 </ul></p></li>
 </ol></div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.delete">
-<p class="title">How to delete an email:</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.single">
+<p class="title">How to delete single emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Press the [Del] or [Backspace] key on the keyboard.</p></li>
 <li class="listitem"><p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Delete</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p></li>
+<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p></li>
 </ul></p>
 </li>
 </ol></div>
@@ -82,7 +82,7 @@
           <p>Result: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted emails</strong></span></a> is disabled:</p>
+<p role="presentation">If the setting <span class="guibutton"><strong>Permanently remove deleted emails</strong></span> is disabled:</p>
 <p role="presentation">The emails are moved to the Trash folder.</p>
 </li>
 <li class="listitem">
@@ -92,17 +92,17 @@
 </ul>  
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptyfolder">
+<div class="task" id="ox.appsuite.user.task.email.manage.delete.emptyfolder">
 <p class="title">How to delete all emails of a folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">In the folder view, select the folder which emails you want to delete.</p></li>
 <li class="step">
 <p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name.</p></li>
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.delete.emptyfolder.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
 </ul></p>
 <p role="presentation">Click on the <span class="guibutton"><strong>Delete all messages</strong></span> button.</p>
-<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted emails</strong></span></a> is enabled, deleted emails cannot be recovered.</p>
+<p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If the setting <span class="guibutton"><strong>Permanently remove deleted emails</strong></span> is enabled, deleted emails can <span class="phrase"><strong>not</strong></span> be recovered, depending on the configuration.</p>
 </li>
 <li class="step"><p role="presentation">Confirm that you want to delete the content of this folder.</p></li>
 </ol></div>
@@ -110,7 +110,7 @@
           <p>Result: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">If the setting <a class="link" href="ox.appsuite.user.sect.email.manage.delete.html#ox.appsuite.user.task.email.manage.delete.setting"><span class="guibutton"><strong>Permanently remove deleted emails</strong></span></a> is disabled:</p>
+<p role="presentation">If the setting <span class="guibutton"><strong>Permanently remove deleted emails</strong></span> is disabled:</p>
 <p role="presentation">The emails are moved to the Trash folder.</p>
 </li>
 <li class="listitem">
@@ -120,60 +120,17 @@
 </ul>
         </div>
 </div>
-<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
-<p class="title">How to recover deleted emails:</p>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Select one or several emails.</p></li>
-<li class="step"><p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
-<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on the <span class="guibutton"><strong>Move</strong></span> button.</p></li>
-</ol></div>
-<div class="taskrelated">
-          <p>Or: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">To recover all emails from the trash, click the <span class="guibutton"><strong>More options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list. Click on the <span class="guibutton"><strong>Move all messages</strong></span> button.</p></li>
-<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
-</ul>
-        </div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever">
-<p class="title">How to permanently delete an email:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> Permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Select one or several emails.</p></li>
-<li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p>
-<p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p>
-</li>
-<li class="step"><p role="presentation">Confirm that you want to permanently delete the selected emails.</p></li>
-</ol></div>
-</div>
-<div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
-<p class="title">How to permanently delete the content of the Trash folder:</p>
-<div class="taskprerequisites">
-          <p><span class="phrase"><strong>Warning:</strong></span> Permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p>
-        </div>
-<div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step">
-<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
-</ul></p>
-<p role="presentation">Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p>
-</li>
-<li class="step"><p role="presentation">Confirm that you want to delete the content of the folder.</p></li>
-</ol></div>
-</div>
 <p id="ox.appsuite.user.related.email.manage.delete"></p>
 <p class="title">User interface:</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.toolbar.html">The <span class="phrase">Email</span> toolbar</a></p></li></ul>
 <p> </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.manage.expungefolder.html">Cleaning up email folders</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.email.manage.recover.html">Recovering emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.22.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.email.manage.delete">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.deleteforever.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.deleteforever.html
new file mode 100644
index 0000000000000000000000000000000000000000..6dcaa53503b912b7534984698647e0635efef8d0
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.deleteforever.html
@@ -0,0 +1,83 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Deleting emails</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">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.recover.html" title="Recovering emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recovering permanently deleted emails">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.recover.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Managing Emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.deleteforever">
+<div class="titlepage"><div><div><h3 class="title">Deleting emails</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.24.2"></a><a class="indexterm" name="id-1.7.15.24.3"></a><p id="ox.appsuite.user.concept.email.manage.deleteforever">The following options exist: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Permanently delete single emails from the trash.</p></li>
+<li class="listitem"><p role="presentation">Permanently delete all emails from the trash by emptying the trash.</p></li>
+</ul>
+<p id="ox.appsuite.user.hint.email.manage.deleteforever.html"><span class="cap-dumpster">Permanently deleted emails can be recovered within 14 days. After this period has expired: </span>Permanently deleted emails can <span class="phrase"><strong>not</strong></span> be recovered.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.single">
+<p class="title">How to permanently delete single emails:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step"><p role="presentation">Select one or several emails.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.single.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p>
+</li>
+<li class="step"><p role="presentation">Confirm that you want to permanently delete the selected emails.</p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.deleteforever.emptytrash">
+<p class="title">How to permanently delete all emails from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.deleteforever.emptytrash.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+</ul></p>
+<p role="presentation">Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Confirm that you want to delete the content of the folder.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.deleteforever"></p>
+<p class="title">User interface:</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.foldertree.html">The <span class="phrase">Email</span> folder view</a></p></li></ul>
+<p> </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.manage.delete.html">Deleting emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.24.8.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></p></li>
+</ul>
+<p id="ox.appsuite.user.parent.email.manage.deleteforever">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
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 108885859a6e63c792c67e49690f7f39737b8920..138e2fdd89ab177dbcb13a930ea45188a2134819 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
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.draft">
 <div class="titlepage"><div><div><h3 class="title">Using email drafts</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">While composing an email, the email is automatically saved as an email draft in regular intervals. The following options exist: </p>
+<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.draft">While composing an email, the email is automatically saved as an email draft in regular intervals. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Edit or send an email draft.</p></li>
 <li class="listitem"><p role="presentation">Edit or send a copy of an email draft.</p></li>
@@ -68,8 +68,8 @@
 <p> </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.send.html">Sending Emails</a></p>
-<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
+<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html
index fefe368a9cea938a9b605a1a712e8b64a323f138..0ee38bea0d0cd0a7180c9576e2c91fb021ac312d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.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.email.manage.html" title="Managing Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Deleting emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.undelete.html" title="Recovering permanently deleted emails">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.unifiedmail.html" title="Using Unified Mail">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.undelete.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Cleaning up email folders</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the email client's settings, emails that you deleted from within an email client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those emails will be shown as crossed out in the groupware. To delete those emails clean up the email folder.</p>
+<a class="indexterm" name="id-1.7.15.26.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the email client's settings, emails that you deleted from within an email client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those emails will be shown as crossed out in the groupware. To delete those emails clean up the email folder.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Note: Depending on the configuration, this function is not available as such emails are not displayed.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">How to clean up an email folder:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
index 62fc739e2892d7bb561d88be8a07299e9f4e4e4d..91811822c35da2ae3fdd37a02cda4857abaf8165 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
@@ -38,17 +38,21 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></p></li>
-<li class="listitem cap-tasks" id="id-1.7.15.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a></p></li>
+<li class="listitem cap-tasks" id="id-1.7.15.4.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a></p></li>
-<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.7.15.4.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.4.1.19"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a></p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
index 21f0adf34c225fbc6f185c9e14b10be64a351990..8ec6e55ca34d85551e36a2d5a4144a212aa99d05 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
+<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">How to import an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html
index a7fa2d0be648f0e66a8c7f91a45407f6a0943c12..230a99560bdee704fa668161de52af68302f5895 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,7 +39,7 @@
 <li class="listitem"><p role="presentation">assign incoming emails to an inbox category</p></li>
 <li class="listitem"><p role="presentation">edit the inbox categories view</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails. Depending on the configuration, you can use separate categories for appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails. Depending on the configuration, you can use separate categories for emails, appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">How to enable or disable the inbox tabs:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -47,7 +47,7 @@
 <p role="presentation">To enable the inbox tabs, click the  <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.activate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">You can also use the <span class="guibutton"><strong>Configure inbox categories</strong></span> button below <span class="guibutton"><strong>Reading</strong></span> in the email settings.</p></li></ul>
 <p role="presentation">The <span class="guilabel"><strong>Configure categories</strong></span> window opens. It shows the available inbox categories. Click on <span class="guibutton"><strong>Enable categories</strong></span>.</p>
-<p role="presentation">On the right side below the menu bar the tabs bar will be displayed.</p>
+<p role="presentation">Below the menu bar, the inbox categories bar will be displayed.</p>
 </li>
 <li class="step">
 <p role="presentation">To disable the inbox tabs, click the  <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.deactivate"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
@@ -63,7 +63,7 @@
 <p role="presentation">Emails that have not been assigned to an inbox category yet, are displayed in the <span class="guibutton"><strong>General</strong></span> tab.</p>
 </li>
 <li class="step">
-<p role="presentation">Drag an email from the list view to a tab in the tabs bar and drop it there.</p>
+<p role="presentation">Drag an email from the list view to a category in the inbox categories bar and drop it there.</p>
 <p role="presentation">You can also select an email. Click the <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> in the toolbar. Select a tab from the menu.</p>
 </li>
 <li class="step"><p role="presentation">In order to finish the process, do one of the following: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -77,14 +77,14 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox categories</strong></span>.</p>
-<p role="presentation">You can also click the <span class="guibutton"><strong>Configure categories</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the category bar.</p>
+<p role="presentation">You can also click the <span class="guibutton"><strong>Configure categories</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.inboxcategories.edit.configure"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the inbox categories bar.</p>
 <p role="presentation">The <span class="guilabel"><strong>Configure categories</strong></span> window opens.</p>
 </li>
 <li class="step">
 <p role="presentation">To enable or disable an inbox category, enable or disable the respective checkbox.</p>
 <p role="presentation">To rename an inbox category, edit the respective text.</p>
 <p role="presentation">Note: Some categories can not be edited.</p>
-<p role="presentation">In order to hide the category bar, click on <span class="guibutton"><strong>Disable categories</strong></span>.</p>
+<p role="presentation">In order to hide the inbox categories bar, click on <span class="guibutton"><strong>Disable categories</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Save</strong></span>.</p></li>
 </ol></div>
@@ -93,7 +93,7 @@
 <p class="title">User interface:</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.settingsmenu.html">The <span class="phrase">Email</span> settings menu</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The <span class="phrase">Email</span> tabs bar</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.tabs.html">The inbox categories bar</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
index 7f40d90f4241864705f182a771f3a2061cc2140a..1ff85ad6dea6184fdb8454eccbc2023e1a586027 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.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.email.manage.html" title="Managing Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.collectaddress.html" title="Collecting addresses">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Marking emails with categories">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Showing the email source">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.source.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.label">
 <div class="titlepage"><div><div><h3 class="title">Categorizing emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Depending on the configuration, you can use one of the following options to categorize emails: </p>
+<a class="indexterm" name="id-1.7.15.12.2"></a><a class="indexterm" name="id-1.7.15.12.3"></a><p id="ox.appsuite.user.concept.email.manage.label">Depending on the configuration, you can use one of the following options to categorize emails: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">a colored label</p></li>
 <li class="listitem"><p role="presentation">a flag</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html
index 113b27f1074a75b42c3dd742db427bce10733d01..380b6415691303b540942db4113ab5de3b2cb92e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
 <div class="titlepage"><div><div><h3 class="title">Exporting emails as PDF</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.17.2"></a><a class="indexterm" name="id-1.7.15.17.3"></a><a class="indexterm" name="id-1.7.15.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Note: Depending on the configuration, this function might not be available.</p>
+<a class="indexterm" name="id-1.7.15.18.2"></a><a class="indexterm" name="id-1.7.15.18.3"></a><a class="indexterm" name="id-1.7.15.18.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Note: Depending on the configuration, this function might not be available.</p>
 <p id="ox.appsuite.user.concept.email.manage.pdfexport">You can export an email and its attachments in docx format as PDF. As soon as the PDF file has been created, it will be saved in a <span class="phrase">Drive</span> folder that can be defined by you. Depending on the data volume, the download can take a while. As soon as the process has been finished, you will receive a notification.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
 <p class="title">How to export emails as PDF:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
index 09faf5a180e704fcf084a64b2ed0187bac2c9cd5..27f78d184ad20674a174f9db54d01f756d5d7519 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.19.2"></a><a class="indexterm" name="id-1.7.15.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an email or several emails.</p>
+<a class="indexterm" name="id-1.7.15.20.2"></a><a class="indexterm" name="id-1.7.15.20.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an email or several emails.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">How to print an email's content:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.recover.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.recover.html
new file mode 100644
index 0000000000000000000000000000000000000000..c0f00eb963a76cc8c111a42820aa05bd9154413c
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.recover.html
@@ -0,0 +1,87 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recovering emails</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">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.delete.html" title="Deleting emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Deleting emails">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.delete.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Managing Emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.recover">
+<div class="titlepage"><div><div><h3 class="title">Recovering emails</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.recover">The following options exist: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Recover single emails from the trash.</p></li>
+<li class="listitem"><p role="presentation">Recover all emails from the trash.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.single">
+<p class="title">How to recover single emails from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Select one or several emails.</p>
+<p role="presentation">In an email’s context menu, click on <span class="guibutton"><strong>Move</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
+</ol></div>
+<div class="taskrelated">
+          <p>Or: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Use drag and drop to move the emails from the trash to a folder in the folder view.</p></li>
+<li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.single.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Move</strong></span>.</p></li>
+</ul>
+        </div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.manage.recover.all">
+<p class="title">How to recover all emails from the trash:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.recover.all.moreoptions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list.</p></li>
+</ul></p>
+<p role="presentation">Click on the <span class="guibutton"><strong>Move all messages</strong></span> button.</p>
+</li>
+<li class="step"><p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on <span class="guibutton"><strong>Move all</strong></span>.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.recover"></p>
+<p class="title">User interface:</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.foldertree.html">The <span class="phrase">Email</span> folder view</a></p></li></ul>
+<p> </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.manage.delete.html">Deleting emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></p></li>
+<li class="listitem cap-dumpster" id="id-1.7.15.23.7.2.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.undelete.html">Recovering permanently deleted emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></p></li>
+</ul>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
index c0ad455a79302a21ca79725892641b7561b5769a..1d711c0aa3fd93d911cbdc54c6570984ec9e3006 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.reminder">
 <div class="titlepage"><div><div><h3 class="title">Creating email reminders</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.14.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">You can activate a reminder for an email. This function creates a task and reminds you of the due date.</p>
+<a class="indexterm" name="id-1.7.15.15.2"></a><p id="ox.appsuite.user.concept.email.manage.reminder">You can activate a reminder for an email. This function creates a task and reminds you of the due date.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.reminder">
 <p class="title">How to create an email reminder:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
index b459a49d025d4318f35cb8bffecbe6312218b65c..16fc2ae75516a268a8e076827de61d0963cb2e3d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.save">
 <div class="titlepage"><div><div><h3 class="title">Saving emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.16.2"></a><p id="ox.appsuite.user.concept.email.manage.save">You can save an email as a text file. The text file has the file extension EML. If you select multiple emails, an eml file will be created for each email. The eml files will be saved as zip archive then.</p>
+<a class="indexterm" name="id-1.7.15.17.2"></a><p id="ox.appsuite.user.concept.email.manage.save">You can save an email as a text file. The text file has the file extension EML. If you select multiple emails, an eml file will be created for each email. The eml files will be saved as zip archive then.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.save">
 <p class="title">How to save an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -52,7 +52,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></p>
 <p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p>
 </li>
-<li class="listitem cap-dataexport" id="id-1.7.15.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.7.15.17.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
index f5c72eaa65c23578b4b28f3db9d2f34992ac01e6..32884326e62b616a8d6424f1906752f995625b3e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.source">
 <div class="titlepage"><div><div><h3 class="title">Showing the email source</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.12.2"></a><p id="ox.appsuite.user.concept.email.manage.source">The email source contains the complete content of an email i.e., the complete email header data.</p>
+<a class="indexterm" name="id-1.7.15.13.2"></a><p id="ox.appsuite.user.concept.email.manage.source">The email source contains the complete content of an email i.e., the complete email header data.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.source">
 <p class="title">How to display the email source:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.undelete.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.undelete.html
new file mode 100644
index 0000000000000000000000000000000000000000..ba1923e9906a743a1e06c22755bc8858dde1233f
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.undelete.html
@@ -0,0 +1,69 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Recovering permanently deleted emails</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">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.deleteforever.html" title="Deleting emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.expungefolder.html" title="Cleaning up email folders">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Managing Emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.undelete">
+<div class="titlepage"><div><div><h3 class="title">Recovering permanently deleted emails</h3></div></div></div>
+<a class="indexterm" name="id-1.7.15.25.2"></a><a class="indexterm" name="id-1.7.15.25.3"></a><p id="ox.appsuite.user.concept.email.manage.undelete.html">You can recover permanently deleted emails within 14 days. After this period has expired, permanently deleted emails are irrevocably lost.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.undelete">
+<p class="title">How to recover permanently deleted emails:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to <span class="guibutton"><strong>Trash</strong></span>.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Recover deleted items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">Select the emails to be recovered in the <span class="guilabel"><strong>Recover deleted items</strong></span> window.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Move selected items</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation">In the <span class="guilabel"><strong>Move</strong></span> window, specify the folder that should contain the recovered emails.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Move</strong></span>.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.undelete"></p>
+<p class="title">User interface:</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.foldertree.html">The <span class="phrase">Email</span> folder view</a></p></li></ul>
+<p> </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.manage.delete.html">Deleting emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.recover.html">Recovering emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.deleteforever.html">Deleting emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.expungefolder.html">Cleaning up email folders</a></p></li>
+</ul>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
index eb2e39cfa7815cfa28d4dc7cfdddf8964410068b..79174c5b9037e64928f9b9c5022e647b388907de 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Using Unified Mail</h3></div></div></div>
-<a class="indexterm" name="id-1.7.15.23.2"></a><a class="indexterm" name="id-1.7.15.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display emails from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
+<a class="indexterm" name="id-1.7.15.27.2"></a><a class="indexterm" name="id-1.7.15.27.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display emails from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In addition to an email account's inbox, the <span class="guibutton"><strong>Unified Mail</strong></span> folder shows a further view for the account's emails. The emails actually exist only once.</p></li>
 <li class="listitem"><p role="presentation">Emails in the Inbox's subfolders are not displayed in the <span class="guibutton"><strong>Unified Mail</strong></span> folder.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
index 67f8c55886bf6e9be8b8c4bc9df9acae5422ed29..4e74cf2c7ab42cd584d0cfa149d162246fbe0a2a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using the AI Integration</title>
+<title>Using the KI Integration</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">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Email">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Sending a vacation notice automatically">
-<link rel="next" href="ox.appsuite.user.sect.email.openai.reply.html" title="Using AI functions when replying to emails">
+<link rel="next" href="ox.appsuite.user.sect.email.openai.reply.html" title="Using KI functions when replying to emails">
 <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"> 
@@ -31,21 +31,21 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.openai">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Using the AI Integration</h2></div></div></div>
-<a class="indexterm" name="id-1.7.12.2"></a><a class="indexterm" name="id-1.7.12.3"></a><p id="ox.appsuite.user.orientation.email.openai">Learn how to use the AI integration to edit email contents: </p>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Using the KI Integration</h2></div></div></div>
+<a class="indexterm" name="id-1.7.12.2"></a><a class="indexterm" name="id-1.7.12.3"></a><p id="ox.appsuite.user.orientation.email.openai">Learn how to use the KI integration to edit email contents: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">edit the content of existing emails or have text suggestions created to reply to them</p></li>
 <li class="listitem"><p role="presentation">have text suggestions created to send new emails</p></li>
 </ul>
-<p> Note: When using the AI integration, the content of the respective email will be sent to the Microsoft Azure OpenAI Service </p>
+<p> Note: When using the AI integration, the content of the respective email will be sent to an OpenAI service. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">The first time you use an AI function, a dialog box opens where you can agree to send this data. You can only use AI functions after having agreed to the data being sent.</p></li>
+<li class="listitem"><p role="presentation">The first time you use an KI function, a dialog box opens where you can agree to send this data. You can only use KI functions after having agreed to the data being sent.</p></li>
 <li class="listitem"><p role="presentation">You can change your consent to send the data at any time. To do so, click on <span class="guibutton"><strong>Change consent</strong></span> below <span class="guibutton"><strong>AI integration</strong></span> in the email settings.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.email.openai">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.email.openai.reply.html">Using AI functions when replying to emails</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when composing emails</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.email.openai">Parent topic: <a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">Email</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.reply.html b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.reply.html
index 497f36e796791d8dafb14f0fd5a3f5f7282f3a0d..6fdedf6bba0d223371f2888ba22135bfe3360314 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.reply.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.reply.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using AI functions when replying to emails</title>
+<title>Using KI functions when replying to emails</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">
-<link rel="up" href="ox.appsuite.user.sect.email.openai.html" title="Using the AI Integration">
-<link rel="prev" href="ox.appsuite.user.sect.email.openai.html" title="Using the AI Integration">
-<link rel="next" href="ox.appsuite.user.sect.email.openai.send.html" title="Using AI functions when composing emails">
+<link rel="up" href="ox.appsuite.user.sect.email.openai.html" title="Using the KI Integration">
+<link rel="prev" href="ox.appsuite.user.sect.email.openai.html" title="Using the KI Integration">
+<link rel="next" href="ox.appsuite.user.sect.email.openai.send.html" title="Using KI functions when composing emails">
 <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"> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Using the AI Integration</h2>
+<h2 class="sr-only">Using the KI Integration</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.openai.reply">
-<div class="titlepage"><div><div><h3 class="title">Using AI functions when replying to emails</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Using KI functions when replying to emails</h3></div></div></div>
 <a class="indexterm" name="id-1.7.12.7.2"></a><a class="indexterm" name="id-1.7.12.7.3"></a><p id="ox.appsuite.user.concept.email.openai.reply">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Have a summary or translation of an email created</p></li>
@@ -81,10 +81,10 @@
 <p> </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.openai.send.html">Using AI functions when 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.openai.send.html">Using KI functions when 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.send.reply.html">Replying to emails</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.email.openai.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
+<p id="ox.appsuite.user.parent.email.email.openai.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.send.html b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.send.html
index 11da6044bafa6662c0e52b0c91aa2f676e8bb3f1..c533226ea5e137ec916464bed90b5e9167e3de3a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.send.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.send.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using AI functions when composing emails</title>
+<title>Using KI functions when composing emails</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">
-<link rel="up" href="ox.appsuite.user.sect.email.openai.html" title="Using the AI Integration">
-<link rel="prev" href="ox.appsuite.user.sect.email.openai.reply.html" title="Using AI functions when replying to emails">
+<link rel="up" href="ox.appsuite.user.sect.email.openai.html" title="Using the KI Integration">
+<link rel="prev" href="ox.appsuite.user.sect.email.openai.reply.html" title="Using KI functions when replying to emails">
 <link rel="next" href="ox.appsuite.user.sect.email.call.html" title="Calling the Sender or Another Recipient">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Using the AI Integration</h2>
+<h2 class="sr-only">Using the KI Integration</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.openai.send">
-<div class="titlepage"><div><div><h3 class="title">Using AI functions when composing emails</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Using KI functions when composing emails</h3></div></div></div>
 <a class="indexterm" name="id-1.7.12.8.2"></a><a class="indexterm" name="id-1.7.12.8.3"></a><p id="ox.appsuite.user.concept.email.openai.send">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">have text suggestions when composing new emails</p></li>
@@ -58,10 +58,10 @@
 <p> </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.openai.reply.html">Using AI functions when replying to emails</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.email.openai.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
+<p id="ox.appsuite.user.parent.email.email.openai.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.search.html b/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
index 8cc57d5d81518800361fa3cf68a79941a7da1c3b..af38b804fd5e4322b788cb7f4e1164d98955ead3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
@@ -93,7 +93,10 @@
 <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.view.html">Viewing Emails</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">Email</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html
index 0442686ef9a3137af562290661710f4db447c82d..918c4e18365b7a56c84df9d51e661de8d415fed3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -5,9 +5,9 @@
 <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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
 <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"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments from existing emails</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.9.2"></a><a class="indexterm" name="id-1.7.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Depending on the configuration, you can add attachments from existing emails to a new email.</p>
@@ -54,14 +54,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.send.attachments.html">Adding attachments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
index 4649d9f2a72f79ce21b7cf59dc4247d62d939d8b..6b1997d2fe9203eaa447c94c04d1b3954ba259d5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending attachments as link</title>
+<title>send attachments as link</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">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing emails">
-<link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
+<link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="use templates">
 <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"> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Sending attachments as link</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">send attachments as link</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">This function allows to send large attachments by email. This is how it works: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The attachments will be uploaded to a new folder below <span class="guibutton"><strong>Drive Mail</strong></span> in the <span class="phrase">Drive</span> app. The name of this folder corresponds to the email subject. The folder is shared with a public link.</p></li>
@@ -84,14 +84,14 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.attachmentlink"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.send.attachments.html">Adding attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html
index b83742a8048d7394f9b75104e435fc4e9aedb8c3..aef10b23b443b976ee698ec42f5323e853d9248e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing emails">
 <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">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.8.2"></a><a class="indexterm" name="id-1.7.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Depending on the configuration, you can attach files that are saved on your computer or in the <span class="phrase">Drive</span> app.</p>
@@ -57,14 +57,14 @@
 </ul>
 <p id="ox.appsuite.user.related.email.send.attachments"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.send.attachmentexisting.html">Adding attachments from existing emails</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html
index dabdc1aaa894033e2a11ecf057323aa4b0516627..747b31cc0c06efbdbff0ca0c975a4ea0cac3ed0b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Sending a vacation notice automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Sending an email to appointment participants</h3></div></div></div>
-<a class="indexterm" name="id-1.7.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
+<a class="indexterm" name="id-1.7.11.17.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
 <p class="title">How to send an email to all appointment participants:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
@@ -53,9 +53,9 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.popup.html">The <span class="phrase">Calendar</span> pop-up</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> toolbar</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html
index 31694669b840c6c0e87600679e6f06f103271413..1989fcc72989963ead228af9521cce0184006f0b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an email to appointment participants">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Automatically forwarding emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let emails be automatically forwarded to another address.</p>
+<a class="indexterm" name="id-1.7.11.16.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let emails be automatically forwarded to another address.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.autoforward">
 <p class="title">How to automatically forward emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -60,7 +60,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.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html
index 4479f1f461758fa014e22114e85d26ee89ff7d87..42b99440f1fa2fe0bf178e51414dc996c04ae71c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Forwarding emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">If you forward an email, some of the email's input fields are pre-filled: </p>
+<a class="indexterm" name="id-1.7.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.forward">If you forward an email, some of the email's input fields are pre-filled: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The subject of the email will be entered as the subject of the forwarded email. The subject will be preceded with the text "Fwd: ".</p></li>
 <li class="listitem">
@@ -69,11 +69,11 @@
 <p> </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.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
index a2e1953fd3928b0d10b2addd4778acbd0b231ca2..b98a00f862b887b7447622c43ed30989de7f4111 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending Emails</title>
+<title>send emails</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">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Email">
 <link rel="prev" href="ox.appsuite.user.sect.email.attachments.html" title="Viewing or Saving Email Attachments">
-<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Sending a new email">
+<link rel="next" href="ox.appsuite.user.sect.email.send.new.html" title="Sending new emails">
 <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"> 
@@ -31,21 +31,22 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Sending Emails</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">send emails</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Learn how to send an email and about the functions available for customizing the email content: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">select a sender address</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p></li>
-<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p></li>
-<li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p></li>
+<li class="listitem cap-infostore" id="id-1.7.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p></li>
+<li class="listitem feat-io-ox-core-templates" id="id-1.7.11.2.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p></li>
+<li class="listitem feat-io-ox-core-scheduleSend" id="id-1.7.11.2.1.9"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p></li>
-<li class="listitem cap-calendar" id="id-1.7.11.2.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p></li>
+<li class="listitem cap-calendar" id="id-1.7.11.2.1.13"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.send"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.later.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.later.html
new file mode 100644
index 0000000000000000000000000000000000000000..b29a901e3022da2f9b06e3f82a3ad9ce4b3dd12c
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.later.html
@@ -0,0 +1,84 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Sending emails</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">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
+<link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to emails">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.signatures.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.reply.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">send emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.send.later">
+<div class="titlepage"><div><div><h3 class="title">Sending emails</h3></div></div></div>
+<a class="indexterm" name="id-1.7.11.13.2"></a><a class="indexterm" name="id-1.7.11.13.3"></a><p id="ox.appsuite.user.concept.email.send.later">Instead of sending an email immediately, you can specify a later point of time for sending the email. </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">This email will be saved in a special email folder.</p></li>
+<li class="listitem"><p role="presentation">You can later change or remove the specified time for sending the email.</p></li>
+<li class="listitem"><p role="presentation">As soon as the point of time has been reached, the email will be sent automatically.</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.send.later">
+<p class="title">How to send an email later:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>New email</strong></span>.</p>
+<p role="presentation">If you work in another app and you do not want to leave that app, you can use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.later.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the button for creating objects.</p>
+</li>
+<li class="step"><p role="presentation">Select one or more recipients.</p></li>
+<li class="step"><p role="presentation">Enter a subject. Enter the email text.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Send later</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.later.schelule"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>Send</strong></span>. A menu opens.</p>
+<p role="presentation">You have the following options: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Select one of the times suggested in the menu.</p></li>
+<li class="listitem"><p role="presentation">Click on <span class="guibutton"><strong>Pick a date and time</strong></span>. Select a time in the <span class="guilabel"><strong>Schedule send</strong></span> window.</p></li>
+</ul></p>
+</li>
+</ol></div>
+<div class="taskrelated">
+          <p>The E-Mail will be saved in the <span class="guibutton"><strong>Scheduled</strong></span> folder. This folder will be created automatically as soon as you initially use this function.</p>
+        </div>
+</div>
+<p id="ox.appsuite.user.options.email.send.later">Options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">To change the time for sending an email, open the email in the <span class="guibutton"><strong>Scheduled</strong></span> folder.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Send later</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.later.options"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>. Change the time.</p>
+</li>
+<li class="listitem"><p role="presentation">You can remove the date on which the email is to be sent. In this case, the E-Mail will be saved in the <span class="guibutton"><strong>Drafts</strong></span> folder.</p></li>
+</ul>
+<p id="ox.appsuite.user.related.email.send.later"></p>
+<p class="title">User interface:</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.new.html">The New email button</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a></p>
+</li></ul>
+<p> </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.send.new.html">Sending new emails</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.send.later">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
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 c1b2c4ba0b221958b2d99e034fcfa2055df29a1a..386dae5deb5fa13695be9674add1f576630b18cf 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
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending a new email</title>
+<title>Sending new emails</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">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="select a sender address">
 <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"> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
-<div class="titlepage"><div><div><h3 class="title">Sending a new email</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Sending new emails</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.5.2"></a><a class="indexterm" name="id-1.7.11.5.3"></a><a class="indexterm" name="id-1.7.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
 <p class="title">How to send a new email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -93,12 +93,12 @@
 <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" 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">Selecting a sender address</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.replyto.html">Setting reply-to address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</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>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
 </li></ul>
 <p> </p>
@@ -108,6 +108,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p>
+<p role="presentation" class="feat-io-ox-core-scheduleSend"><a class="xref" href="ox.appsuite.user.sect.email.send.later.html">Sending emails</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
 <p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a></p>
@@ -115,10 +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 feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using KI functions when 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.html">Email Settings</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>
+<p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html
index 129153f53e9fd3c33c56a7b432a675db4e053b2f..695d66b08f53152e1f478400c76554da73a7ca64 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.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.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.later.html" title="Sending emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.signatures.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.later.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.forward.html">Next</a></li>
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Replying to emails</h3></div></div></div>
-<a class="indexterm" name="id-1.7.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">When replying to an email, some of the email's input fields are pre-filled: </p>
+<a class="indexterm" name="id-1.7.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.reply">When replying to an email, some of the email's input fields are pre-filled: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The sender of the email and additional recipients of the email will be automatically entered as recipients of the reply email.</p></li>
 <li class="listitem"><p role="presentation">The email subject will be entered in the subject field of the reply email. The subject will be preceded with the text "Re: ".</p></li>
@@ -65,13 +65,13 @@
 <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.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
 </li>
-<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.13.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a></p></li>
+<li class="listitem feat-io-ox-core-openai" id="id-1.7.11.14.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using KI functions when replying to emails</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html
index 329e19f16f2700710e505e3b26fdc03ac0fda654..b62c761966bd0f6f7f44af82df57c980438eaee2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.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.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="select a sender address">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
 <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">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Setting reply-to address</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">By default, when a recipient replies to your email, the reply is sent to the email account from which you sent the email. Alternatively, you can use the email editing window to specify the email addresses to which the reply to the sent email will be sent.</p>
@@ -38,11 +38,11 @@
 <p class="title">How to select a reply-to address in the email editing window:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the email editing window, click on <span class="guibutton"><strong>RE</strong></span> next to the sender address. The <span class="guibutton"><strong>Reply to</strong></span> input field will be displayed.</p>
-<p role="presentation">If you have specified default reply addresses while editing your primary email account, the <span class="guibutton"><strong>Reply to</strong></span> input field is automatically displayed. The input field includes the preset reply-to addresses.</p>
+<p role="presentation">In the email editing window, click on <span class="guibutton"><strong>Re</strong></span> next to the sender address. The <span class="guibutton"><strong>Reply to</strong></span> input field will be displayed.</p>
+<p role="presentation">If you have specified preset reply addresses while editing your primary email account, the <span class="guibutton"><strong>Reply to</strong></span> input field is automatically displayed. The input field includes the preset reply-to addresses.</p>
 </li>
 <li class="step">
-<p role="presentation">In <span class="guibutton"><strong>Reply to</strong></span>, enter the email addresses to which you want the reply to your email to be sent. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">In <span class="guibutton"><strong>Reply to</strong></span>, enter the email addresses to which the reply to your email should be sent. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p></li>
 <li class="listitem"><p role="presentation">To select contacts from an address book, click the <span class="guibutton"><strong>Select contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.replyto.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> on the right side of the input field.</p></li>
 </ul></p>
@@ -52,11 +52,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.replyto"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.dataorganisation.accounts.primarymail.html">Editing the primary email account</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
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 ffa25f3124b01d36c1c889211fba5282f67dd2d1..82036501bd80e328d67650e3c915fe224c25877b 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
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Selecting a sender address</title>
+<title>select a sender address</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">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Sending a new email">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Sending new emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
-<div class="titlepage"><div><div><h3 class="title">Selecting a sender address</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">select a sender address</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">If sending an email, you can set the sender address to be shown to the recipient, in the email editing window.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.sender">
 <p class="title">How to select your sender address in the E-Mail editing window:</p>
@@ -54,11 +54,11 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.sender"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.accounts.html">Adding Email Accounts</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
index a2256c088e5f167bbe9e8a98ba0cde66fbdd2e42..e9a1a5f14cf3cc4a34e7618ba728afbf7532e77a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,9 +5,9 @@
 <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.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
-<link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="use templates">
+<link rel="next" href="ox.appsuite.user.sect.email.send.later.html" title="Sending emails">
 <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"> 
@@ -25,12 +25,12 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.templates.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.reply.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.later.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Using signatures</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.12.2"></a><a class="indexterm" name="id-1.7.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">An email signature is text that will be entered automatically in the email when being composed or replied to or forwarded. It is typically used for inserting the name, company, and contact address at the bottom of the email text. You can create signatures in the plain text or html format. The following functions are available: </p>
@@ -86,15 +86,15 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.signatures"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </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.settings.html">Email Settings</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p>
-<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html
index 9e39422dbb34623fd547bd3ee0c1b3d04340964d..d3046f6482cde94b8115e38e1acf517516130dff 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using templates</title>
+<title>use templates</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">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
 <link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
-<div class="titlepage"><div><div><h3 class="title">Using templates</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">use templates</h3></div></div></div>
 <a class="indexterm" name="id-1.7.11.11.2"></a><a class="indexterm" name="id-1.7.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Templates are text modules that you can write once and then insert into your emails as often as you like. As a result, you only have to write frequently used phrases once. Templates, signatures and email drafts differ in the following ways: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Templates can be inserted into an email multiple times at any place and can be edited.</p></li>
@@ -83,7 +83,7 @@
 </div>
 <p id="ox.appsuite.user.related.email.send.templates"></p>
 <p class="title">Superordinated action:</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.send.new.html">Sending a new email</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.email.send.new.html">Sending new emails</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -91,7 +91,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.templates">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.templates">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html
index 264607c34acdc1ae458d57aa1932dffe1f62919a..cf780b0c2d1c06cc88a5fd000b3427804c3d127a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,9 +5,9 @@
 <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.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an email to appointment participants">
-<link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Using the AI Integration">
+<link rel="next" href="ox.appsuite.user.sect.email.openai.html" title="Using the KI Integration">
 <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"> 
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Sending a vacation notice automatically</h3></div></div></div>
-<a class="indexterm" name="id-1.7.11.17.2"></a><a class="indexterm" name="id-1.7.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">A vacation notice informs the sender of an email that you will not retrieve your emails for a specific period of time. You can set the following: </p>
+<a class="indexterm" name="id-1.7.11.18.2"></a><a class="indexterm" name="id-1.7.11.18.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">A vacation notice informs the sender of an email that you will not retrieve your emails for a specific period of time. You can set the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">the subject and text of the vacation notice</p></li>
 <li class="listitem"><p role="presentation">the time frame when the vacation notice is active</p></li>
@@ -76,14 +76,14 @@
 <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.settings.html">Email Settings</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<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.send.new.html">Sending new emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.html
index 402020ac63116287145743afecd52a3b6a93859f..9d62854136f9fe5518b62ff0dc17a334754fe908 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.html
@@ -50,14 +50,14 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Compose &amp; Reply</a></p></li>
 <li class="listitem feat-io-ox-core-templates" id="id-1.7.20.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Rules</a></p></li>
-<li class="listitem feat-zoom" id="id-1.7.20.5.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integration</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.7.20.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Advanced settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integration</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Advanced settings</a></p></li>
 </ul>
 <p> Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
 <h3 class="title">Reading</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>layout. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Defines the layout of the list view and the detail view in the display area.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Layout. </b><a class="indexterm" name="id-1.7.20.6.2.1.1.1.2"></a>Defines the layout of the list view and the detail view in the display area.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>message list. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -65,17 +65,18 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.preview"><b>Show text preview. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.2.1.2"></a>Defines whether the first words of the mail content will be displayed in the email list view.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Always show full date and time. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.3.1.2"></a>Defines whether not only the date of receipt but also the time of receipt will be displayed in the email list view.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>Show message size. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.4.1.2"></a>Defines whether an email’s size will be displayed in the email list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.20.6.2.1.2.1.3.1.5"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Show categories. </b><a class="indexterm" name="id-1.7.20.6.2.1.2.1.3.1.5.1.2"></a>Defines whether the categories assigned to the email will be displayed in the email list view.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>reading pane. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Reading pane. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.quoting"><b>show quoted text in different color. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.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.reading.readingpane.quoting"><b>Show quoted text in different color. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.1.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.reading.readingpane.fixedfont"><b>Use fixed-width font for plain text mails. </b><a class="indexterm" name="id-1.7.20.6.2.1.3.1.3.1.2.1.2"></a>Specifies whether a fixed-width font is used when displaying a plain text email.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>mark as read. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.3"></a>Defines the period after which an email will be automatically marked as read when selecting the email. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Mark as read. </b><a class="indexterm" name="id-1.7.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.20.6.2.1.4.1.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: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.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.reading.markasread.seconds"><b>After 5 seconds, after 20 seconds. </b>The email will be marked as read after the period defined.</p></li>
@@ -105,7 +106,7 @@
 <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>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>message format. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Defines the format in which emails are sent: </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Message format. </b><a class="indexterm" name="id-1.7.20.8.2.1.1.1.3.1.2.1.2"></a>Defines the format in which emails are sent: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
 <li class="listitem"><p><b>HTML. </b>The email will be sent with html markup. You can format the email text.</p></li>
 <li class="listitem"><p><b>Plain text. </b>The email text will be sent as plain text without formatting.</p></li>
@@ -126,7 +127,7 @@
 <div id="ox.appsuite.user.reference.email.settings.templates" class="feat-io-ox-core-templates">
 <p id="ox.appsuite.user.reference.email.settings.templates"></p>
 <h3 class="title">Templates</h3>
-<p>See <a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+<p>See <a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">use templates</a></p>
 </div>
 <p id="ox.appsuite.user.reference.email.settings.rules"></p>
 <h3 class="title">Rules</h3>
@@ -137,26 +138,26 @@
 </ul>
 <p id="ox.appsuite.user.reference.email.settings.openai"></p>
 <h3 class="title">AI integration</h3>
-<p>See <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
+<p>See <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the KI Integration</a></p>
 <p id="ox.appsuite.user.reference.email.settings.advanced"></p>
 <h3 class="title">Advanced settings</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Allow displaying HTML formatted emails. </b><a class="indexterm" name="id-1.7.20.12.2.1.1.1.2"></a>Specifies whether or not displaying HTML messages is allowed.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>show requests for read receipts. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.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.advanced.deliveryreceipt"><b>Show requests for read receipts. </b><a class="indexterm" name="id-1.7.20.12.2.1.2.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.advanced.delete"><b>permanently remove deleted emails. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.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 id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Permanently remove deleted emails. </b><a class="indexterm" name="id-1.7.20.12.2.1.3.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> Depending on the configuration, permanently deleted emails can <span class="bold">not</span> be recovered.</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.advanced.selectrecent"><b>Select newest read message automatically at start. </b><a class="indexterm" name="id-1.7.20.12.2.1.4.1.2"></a>Defines whether the most recent read message will be selected automatically when starting the app.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.collectsend"><b>Automatically collect contacts in the "Collected addresses" folder while sending emails. </b><a class="indexterm" name="id-1.7.20.12.2.1.5.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.advanced.collectread"><b>Automatically collect contacts in the "Collected addresses" folder while reading emails. </b><a class="indexterm" name="id-1.7.20.12.2.1.6.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.advanced.mailto"><b>ask for mailto link registration. </b><a class="indexterm" name="id-1.7.20.12.2.1.7.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.advanced.mailto"><b>Ask for mailto link registration. </b><a class="indexterm" name="id-1.7.20.12.2.1.7.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.advanced.quote"><b>Insert the original email text to a reply. </b><a class="indexterm" name="id-1.7.20.12.2.1.8.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.advanced.mailinglist"><b>Ask before replying to a mailing list. </b><a class="indexterm" name="id-1.7.20.12.2.1.9.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.advanced.appendvcard"><b>Always attach my detailed contact data as vCard. </b><a class="indexterm" name="id-1.7.20.12.2.1.10.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.advanced.forward"><b>forward emails as. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifies how an email text is sent when forwarding the email. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Forward emails as. </b><a class="indexterm" name="id-1.7.20.12.2.1.11.1.2"></a>Specifies how an email text is sent when forwarding the email. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Inline. </b>The text is sent within the new email text.</p></li>
 <li class="listitem"><p><b>Attachment. </b>The text is sent as attachment to the new email.</p></li>
@@ -169,7 +170,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.email.send.new.html">Sending a new email</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Editing the primary email account</a></p>
 </li>
@@ -177,7 +178,7 @@
 <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.html">Email Settings</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.send.new.html">Sending new emails</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.guard.email.send.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.email.send.html
index 369ace82c5c8d2ba82b6adc54680f96782d3e4c7..7cd7fbae0de787a7b6375ca2f93db12c351d9281 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.email.send.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.email.send.html
@@ -98,7 +98,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">How can external recipients read an encrypted email?</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Encrypting Email Conversations</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.call.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.call.html
index d2f9d2e28727840e1cbc6e635f9167a9f48dfc0a..a75cce0ce5c7a9665ed764a80371fcd3148cdb55 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.call.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.call.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.tasks.html" title="Tasks">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.edit.html" title="Editing Tasks">
-<link rel="next" href="ox.appsuite.user.sect.tasks.folder.html" title="Adding Task Lists">
+<link rel="next" href="ox.appsuite.user.sect.tasks.folder.html" title="add task lists">
 <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.tasks.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.html
index 8fc40f5b1fcd92fec1788917d84e26466ccb1f64..bcae22a5b9f02faadb903b6898da55f5b99dd940 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Adding Task Lists</title>
+<title>add task lists</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">Tasks</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.tasks.folder">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Adding Task Lists</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">add task lists</h2></div></div></div>
 <a class="indexterm" name="id-1.10.14.2"></a><a class="indexterm" name="id-1.10.14.3"></a><p id="ox.appsuite.user.orientation.tasks.folder">With task lists you can organize your tasks, e.g. by separately saving tasks by customers or projects. Learn how to create personal task lists and how to set the view for shared task lists.</p>
 <p id="ox.appsuite.user.concept.tasks.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.tasks.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.personal.html
index 171b1b3e23b38daaf62885de6f99006145529bb6..97e6890dd7a1aa4e1427026fb452da5f58b9af0d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.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.tasks.folder.html" title="Adding Task Lists">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.folder.html" title="Adding Task Lists">
+<link rel="up" href="ox.appsuite.user.sect.tasks.folder.html" title="add task lists">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.folder.html" title="add task lists">
 <link rel="next" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html" title="Subscribing to public and shared task lists">
 <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">Tasks</span></h1>
-<h2 class="sr-only">Adding Task Lists</h2>
+<h2 class="sr-only">add task lists</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.folder.personal">
 <div class="titlepage"><div><div><h3 class="title">Adding personal task list</h3></div></div></div>
 <a class="indexterm" name="id-1.10.14.8.2"></a><a class="indexterm" name="id-1.10.14.8.3"></a><p id="ox.appsuite.user.concept.tasks.folder.personal">You can create additional personal task lists below My lists.</p>
@@ -50,7 +50,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.tasks.folder.personal">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p>
+<p id="ox.appsuite.user.parent.tasks.folder.personal">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.subscribeshared.html
index 9f28896eddf4163cdcac9c26f56da2a57407e2c9..d72c0f51a88a9bcbf4ad69d433cfb22e585a21d9 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.subscribeshared.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.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.tasks.folder.html" title="Adding Task Lists">
+<link rel="up" href="ox.appsuite.user.sect.tasks.folder.html" title="add task lists">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.folder.personal.html" title="Adding personal task list">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
 <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">Tasks</span></h1>
-<h2 class="sr-only">Adding Task Lists</h2>
+<h2 class="sr-only">add task lists</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.folder.subscribeshared">
 <div class="titlepage"><div><div><h3 class="title">Subscribing to public and shared task lists</h3></div></div></div>
 <a class="indexterm" name="id-1.10.14.9.2"></a><a class="indexterm" name="id-1.10.14.9.3"></a><p id="ox.appsuite.user.concept.tasks.folder.subscribeshared">Task lists that are public or shared by other users can be used as follows: </p>
@@ -72,7 +72,7 @@
 <p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.consume.html">Accessing other users' shares</a></p>
 <p role="presentation" class="cap-dataexport"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.tasks.folder.subscribeshared">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p>
+<p id="ox.appsuite.user.parent.tasks.folder.subscribeshared">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.detailview.html
index a5fd58d36e64f8274d7fef9a5ca2c60701ee6732..1b8c61812f2ee8697047224cbf7e1868e8363b93 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.detailview.html
@@ -47,7 +47,7 @@
 <li class="listitem"><p role="presentation">The task's subject</p></li>
 <li class="listitem"><p role="presentation">The task's reminder date, if set</p></li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.10.7.10.4.1.5">
-<p role="presentation">The categories assigned</p>
+<p role="presentation">the categories assigned</p>
 <p role="presentation">Clicking on a category searches for tasks to which that category has been assigned.</p>
 </li>
 <li class="listitem"><p role="presentation">If the task is a recurring task, recurrence parameters will be displayed.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 452b7a4ffd5a29b387e33cfc501945d38f125b79..24d81b29526890601a1a7c9562944d3cc7287427 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.foldertree.html
@@ -51,7 +51,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.tasks.view.html">Viewing Tasks</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">Adding Task Lists</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.html">add task lists</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.tasks.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html
new file mode 100644
index 0000000000000000000000000000000000000000..e1a15e25ec43e64486cd63b20ecf427ea70ee215
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -0,0 +1,65 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Marking appointments with categories</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">
+<link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changing a task's due date">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Moving tasks to another folder">
+<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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Tasks</span></h1>
+<h2 class="sr-only">Managing Tasks</h2>
+<div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
+<div class="titlepage"><div><div><h3 class="title">Marking appointments with categories</h3></div></div></div>
+<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">To organize tasks independently from folders, you can mark tasks with categories.</p>
+<div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
+<p class="title">How to mark tasks with a category:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Select a task. Click the <span class="guibutton"><strong>Edit contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">The task editing window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select an existing category or create a new one.</p>
+<p role="presentation">In order to remove a category, click the <span class="guibutton"><strong>Remove category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.removecategory"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the category.</p>
+</li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.tasks.manage.categories"></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.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Marking emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Marking appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Marking contacts with categories</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.tasks.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index eea4e2dfa12ae39f23190b9352725a012f742841..ea2bc0ce3265bc6b5630fd7a9ec3ca4d3341b556 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marking tasks as done">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.move.html" title="Moving tasks to another folder">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Marking appointments with categories">
 <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"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.move.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changestatus.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changestatus.html
index 03ad2034ebdf5f3534feb386c3662adb399f386a..4098a00c19e9a05274607b51c1e09b2272713531 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changestatus.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changestatus.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.changestatus">
 <div class="titlepage"><div><div><h3 class="title">Changing task confirmations</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.10.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">If you are a task participant, you can later change your confirmation for this task. You can add a comment that is visible to other task participants.</p>
+<a class="indexterm" name="id-1.10.15.11.2"></a><p id="ox.appsuite.user.concept.tasks.manage.changestatus">If you are a task participant, you can later change your confirmation for this task. You can add a comment that is visible to other task participants.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.changestatus">
 <p class="title">How to change your confirmation:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.delete.html
index 57a32363338666a223163bb14b9424df22902c8b..dd4e1bcb9bb7d5e3df887b3ca3d6d4422d64b24f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted tasks can <span class="phrase"><strong>not</strong></span> be restored.</p>
+<a class="indexterm" name="id-1.10.15.15.2"></a><a class="indexterm" name="id-1.10.15.15.3"></a><p id="ox.appsuite.user.caution.tasks.manage.delete"><span class="phrase"><strong>Warning:</strong></span> Deleted tasks can <span class="phrase"><strong>not</strong></span> be restored.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.delete">
 <p class="title">How to delete tasks:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.export.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.export.html
index 8fee1b76c214b0a189fb046ca4ee8dc89fdcb623..0720a2138ac4875046dc57659fec9e308df4129d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.export.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.export.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.export">
 <div class="titlepage"><div><div><h3 class="title">Exporting tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">You can export tasks in the iCal format. You can e.g. use this format to exchange tasks with other calendar applications. You can export single tasks or all tasks from a folder.</p>
+<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><a class="indexterm" name="id-1.10.15.13.4"></a><p id="ox.appsuite.user.concept.tasks.manage.export">You can export tasks in the iCal format. You can e.g. use this format to exchange tasks with other calendar applications. You can export single tasks or all tasks from a folder.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.export.selected">
 <p class="title">How to export single tasks:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -63,7 +63,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.tasks.manage.import.html">Importing tasks</a></p></li>
-<li class="listitem cap-dataexport" id="id-1.10.15.12.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
+<li class="listitem cap-dataexport" id="id-1.10.15.13.8.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.export">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html
index b60e8df597bfcc1f9eb5e43749f33a8c2e43a0a2..e1b1a61d408b2904253262875b1d02060329363c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html
@@ -36,6 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></p></li>
@@ -45,7 +46,7 @@
 </ul>
 <p id="ox.appsuite.user.related.tasks.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.tasks.folder.html">Adding Task Lists</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.tasks.folder.html">add task lists</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage">Parent topic: <a class="xref" href="ox.appsuite.user.chap.tasks.html"><i><span class="phrase">Tasks</span></i></a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.import.html
index 425abf8fa5f5473934f948e64e493ae688e994c0..7607dabaf7317f6d817692370a8b41ba9a40c988 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.import.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.11.2"></a><a class="indexterm" name="id-1.10.15.11.3"></a><a class="indexterm" name="id-1.10.15.11.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">You can import tasks from files in iCal format.</p>
+<a class="indexterm" name="id-1.10.15.12.2"></a><a class="indexterm" name="id-1.10.15.12.3"></a><a class="indexterm" name="id-1.10.15.12.4"></a><p id="ox.appsuite.user.concept.tasks.manage.import">You can import tasks from files in iCal format.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.import">
 <p class="title">How to import tasks from an iCal file:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html
index bb36136da8f9cb7a4997454c9e4e72f44b923ada..36901d8b0ee1ea7c0c36771f84527aef123d3bc5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.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.tasks.manage.html" title="Managing Tasks">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html" title="Changing a task's due date">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Marking appointments with categories">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Changing task confirmations">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.categories.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.move">
 <div class="titlepage"><div><div><h3 class="title">Moving tasks to another folder</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">You can move tasks to another folder.</p>
+<a class="indexterm" name="id-1.10.15.10.2"></a><a class="indexterm" name="id-1.10.15.10.3"></a><p id="ox.appsuite.user.concept.tasks.manage.move">You can move tasks to another folder.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.move">
 <p class="title">How to move tasks to another folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.print.html
index b0694f8da6e3ecf8022ed3c1cf5f15d5052567ed..66a9d960497caa96bc54879fc07bf4313f4c4af7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.print.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing tasks</h3></div></div></div>
-<a class="indexterm" name="id-1.10.15.13.2"></a><a class="indexterm" name="id-1.10.15.13.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">You can print the data of a single task or of multiple tasks.</p>
+<a class="indexterm" name="id-1.10.15.14.2"></a><a class="indexterm" name="id-1.10.15.14.3"></a><p id="ox.appsuite.user.concept.tasks.manage.print">You can print the data of a single task or of multiple tasks.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.print.data">
 <p class="title">How to print a task's data:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
index 1b7d206b523bdb14e9be8a6aba8508e3ab36870b..ad26e4baf893d1bc9d49de307468258091318d71 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
@@ -81,7 +81,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.tasks.view.html">Viewing Tasks</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.16.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Marking appointments with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>