From 42d5da02496e9948248726b2c8e92a84fb54d7c8 Mon Sep 17 00:00:00 2001
From: "antje.faber" <antje.faber@open-xchange.com>
Date: Fri, 1 Sep 2023 11:58:06 +0200
Subject: [PATCH] en-US online help help 8.17

---
 help/l10n/en_US/bk01-toc.html                 |  25 +-
 help/l10n/en_US/index.html                    |   8 +-
 .../en_US/ox.appsuite.user.chap.calendar.html |   4 +-
 .../en_US/ox.appsuite.user.chap.contacts.html |   4 +-
 ...x.appsuite.user.chap.dataorganisation.html |   6 +-
 .../en_US/ox.appsuite.user.chap.drive.html    |   4 +-
 .../en_US/ox.appsuite.user.chap.email.html    |   6 +-
 .../en_US/ox.appsuite.user.chap.guard.html    |   4 +-
 .../en_US/ox.appsuite.user.chap.portal.html   |   2 +-
 .../en_US/ox.appsuite.user.chap.security.html |  26 +-
 .../en_US/ox.appsuite.user.chap.settings.html |  12 +-
 .../en_US/ox.appsuite.user.chap.tasks.html    |   6 +-
 help/l10n/en_US/ox.appsuite.user.index.html   | 245 +++++++++---------
 .../ox.appsuite.user.sect.about.glossary.html |   2 +-
 ...uite.user.sect.calendar.add.attendees.html |   6 +-
 ...er.sect.calendar.add.conflicthandling.html |   4 +-
 ...ppsuite.user.sect.calendar.add.create.html |   4 +-
 ...suite.user.sect.calendar.add.followup.html |   4 +-
 .../ox.appsuite.user.sect.calendar.add.html   |   4 +-
 ...user.sect.calendar.add.icalattachment.html |   4 +-
 ...ite.user.sect.calendar.add.recipients.html |   6 +-
 ...ite.user.sect.calendar.add.scheduling.html |   8 +-
 ...ox.appsuite.user.sect.calendar.deputy.html |   2 +-
 ...uite.user.sect.calendar.folder.import.html |   6 +-
 ...te.user.sect.calendar.folder.personal.html |   2 +-
 ...e.user.sect.calendar.folder.subscribe.html |   5 +-
 ....sect.calendar.folder.subscribeshared.html |   4 +-
 ...psuite.user.sect.calendar.gui.toolbar.html |   2 +-
 ...ppsuite.user.sect.calendar.invitation.html |   6 +-
 ...e.user.sect.calendar.manage.timezones.html |  10 +-
 ....calendar.managedresources.administer.html |   2 +-
 ....appsuite.user.sect.calendar.settings.html |  39 +--
 ...sect.contacts.folder.managesubscribed.html |  12 +-
 ...te.user.sect.contacts.folder.personal.html |   2 +-
 ...e.user.sect.contacts.folder.subscribe.html |   5 +-
 ....sect.contacts.folder.subscribeshared.html |   6 +-
 ....appsuite.user.sect.contacts.settings.html |  17 +-
 ...ite.user.sect.contacts.useaddressbook.html |   2 +-
 ...r.sect.dataorganisation.accounts.edit.html |   5 +-
 ...aorganisation.accounts.functionalmail.html |   7 +-
 ...e.user.sect.dataorganisation.accounts.html |   1 +
 ...dataorganisation.accounts.primarymail.html |   7 +-
 ...user.sect.dataorganisation.categories.html |  10 +-
 ...user.sect.dataorganisation.deputy.add.html |  10 +-
 ...ser.sect.dataorganisation.deputy.edit.html |  16 +-
 ...ite.user.sect.dataorganisation.deputy.html |   4 +-
 ...dataorganisation.downloadpersonaldata.html |   4 +-
 ...ite.user.sect.dataorganisation.folder.html |   2 +-
 ...ser.sect.dataorganisation.folder.kind.html |   2 +-
 ...sect.dataorganisation.sharing.consume.html |   2 +-
 ...ect.dataorganisation.sharing.examples.html |   2 +-
 ...ataorganisation.sharing.subscribeimap.html |   4 +-
 ...suite.user.sect.drive.folder.personal.html |   2 +-
 .../ox.appsuite.user.sect.drive.settings.html |  13 +-
 ....appsuite.user.sect.email.attachments.html |   2 +-
 .../ox.appsuite.user.sect.email.deputy.html   |   4 +-
 .../ox.appsuite.user.sect.email.folder.html   |   5 +-
 ...ite.user.sect.email.mailfilter.change.html |   4 +-
 ...ite.user.sect.email.mailfilter.create.html |   2 +-
 ...appsuite.user.sect.email.manage.draft.html |   2 +-
 ...ser.sect.email.manage.inboxcategories.html |   2 +-
 ....appsuite.user.sect.email.openai.send.html |   2 +-
 ...er.sect.email.send.attachmentexisting.html |   6 +-
 ...e.user.sect.email.send.attachmentlink.html |   6 +-
 ...uite.user.sect.email.send.attachments.html |   6 +-
 ...psuite.user.sect.email.send.attendees.html |   6 +-
 ...uite.user.sect.email.send.autoforward.html |   6 +-
 ...appsuite.user.sect.email.send.forward.html |   6 +-
 .../ox.appsuite.user.sect.email.send.html     |   4 +-
 .../ox.appsuite.user.sect.email.send.new.html |  13 +-
 ...x.appsuite.user.sect.email.send.reply.html |   6 +-
 ...appsuite.user.sect.email.send.replyto.html |   6 +-
 ....appsuite.user.sect.email.send.sender.html |   6 +-
 ...suite.user.sect.email.send.signatures.html |  10 +-
 ...psuite.user.sect.email.send.templates.html |   8 +-
 ...e.user.sect.email.send.vacationnotice.html |   6 +-
 .../ox.appsuite.user.sect.email.settings.html |  41 +--
 ...e.user.sect.firststeps.changepassword.html |   2 +-
 ....user.sect.firststeps.gui.applauncher.html |   2 +-
 ...e.user.sect.firststeps.gui.foldertree.html |   2 +-
 .../ox.appsuite.user.sect.firststeps.gui.html |   2 +-
 ...appsuite.user.sect.firststeps.gui.new.html |   2 +-
 ....sect.firststeps.gui.notificationarea.html |   2 +-
 ...ppsuite.user.sect.firststeps.keyboard.html |   6 +-
 ...x.appsuite.user.sect.guard.email.send.html |   4 +-
 ...te.user.sect.guard.keys.pgppublickeys.html |   2 +-
 ...uite.user.sect.guard.keys.yourpgpkeys.html |   2 +-
 ...te.user.sect.guard.keys.yoursmimekeys.html |   4 +-
 .../ox.appsuite.user.sect.guard.password.html |  12 +-
 .../ox.appsuite.user.sect.guard.settings.html |  10 +-
 ...psuite.user.sect.portal.customize.add.html |   2 +-
 ...ox.appsuite.user.sect.portal.settings.html |  14 +-
 ...suite.user.sect.security.apppasswords.html |  10 +-
 ...ppsuite.user.sect.security.autologout.html |  17 +-
 ....user.sect.security.emaillinkedimages.html |  19 +-
 ...ct.security.multifactor.authenticator.html |   6 +-
 ...psuite.user.sect.security.multifactor.html |   8 +-
 ...user.sect.security.multifactor.manage.html |  14 +-
 ...er.sect.security.multifactor.recovery.html |   8 +-
 ...sect.security.multifactor.securitykey.html |   4 +-
 ...er.sect.security.multifactor.settings.html |  13 +-
 ...te.user.sect.security.multifactor.sms.html |   6 +-
 ....appsuite.user.sect.security.sessions.html |  11 +-
 ...ite.user.sect.settings.commonsettings.html |  56 ++--
 ...appsuite.user.sect.settings.countdown.html |  25 +-
 ...e.user.sect.settings.notificationarea.html |  14 +-
 ...uite.user.sect.settings.notifications.html |  58 +++--
 ...suite.user.sect.settings.personaldata.html |   8 +-
 ...ite.user.sect.settings.presencestatus.html |   2 +-
 ...ox.appsuite.user.sect.settings.search.html |  74 ++++++
 ...ox.appsuite.user.sect.settings.wizard.html |   4 +-
 .../ox.appsuite.user.sect.tasks.call.html     |   2 +-
 .../ox.appsuite.user.sect.tasks.folder.html   |  10 +-
 ...suite.user.sect.tasks.folder.personal.html |  16 +-
 ...ser.sect.tasks.folder.subscribeshared.html |  16 +-
 ...psuite.user.sect.tasks.gui.foldertree.html |   2 +-
 .../ox.appsuite.user.sect.tasks.gui.new.html  |   2 +-
 ...uite.user.sect.tasks.gui.settingsmenu.html |   2 +-
 ...x.appsuite.user.sect.tasks.invitation.html |   6 +-
 .../ox.appsuite.user.sect.tasks.manage.html   |   4 +-
 ....appsuite.user.sect.tasks.manage.move.html |   2 +-
 121 files changed, 684 insertions(+), 569 deletions(-)
 create mode 100644 help/l10n/en_US/ox.appsuite.user.sect.settings.search.html

diff --git a/help/l10n/en_US/bk01-toc.html b/help/l10n/en_US/bk01-toc.html
index 24b890cb6..4de5ef1bf 100644
--- a/help/l10n/en_US/bk01-toc.html
+++ b/help/l10n/en_US/bk01-toc.html
@@ -66,10 +66,11 @@
 </li>
 <li class="chapter">
 <a href="ox.appsuite.user.chap.settings.html">Customized Settings</a><ul>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a></li>
 <li class="sect1 feat-io-ox-core-countdown"><a href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></li>
 <li class="sect1 cap-switchboard"><a href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></li>
@@ -122,7 +123,7 @@
 <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">Send emails</a><ul>
+<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 a new email</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>
@@ -222,10 +223,10 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">add attachments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></li>
 </ul>
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></li>
@@ -367,9 +368,9 @@
 <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>
-<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">Subscribe to public and shared task lists</a></li>
+<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">add personal task list</a></li>
+<li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></li>
 </ul>
 </li>
 <li class="sect1 cap-tasks">
@@ -473,7 +474,7 @@
 </ul>
 </li>
 <li class="sect1 cap-deputy">
-<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a><ul>
+<a href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a><ul>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.add.html">Adding deputies</a></li>
 <li class="sect2 cap-deputy"><a href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Viewing, editing, deleting deputies</a></li>
 </ul>
@@ -491,20 +492,20 @@
 </li>
 <li class="chapter">
 <a href="ox.appsuite.user.chap.security.html">Data Security</a><ul>
-<li class="sect1"><a href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></li>
-<li class="sect1"><a href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.security.sessions.html">Displaying or Signing Out from Active Clients</a></li>
 <li class="sect1"><a href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></li>
 <li class="sect1 cap-multifactor">
 <a href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a><ul>
-<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></li>
+<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></li>
-<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering the verification</a></li>
+<li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering verifications</a></li>
 <li class="sect2 cap-multifactor"><a href="ox.appsuite.user.sect.security.multifactor.manage.html">Managing verification methods</a></li>
 </ul>
 </li>
+<li class="sect1"><a href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a></li>
+<li class="sect1"><a href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></li>
 </ul>
 </li>
 <li class="chapter cap-guard">
diff --git a/help/l10n/en_US/index.html b/help/l10n/en_US/index.html
index c5e513cdb..081509132 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, August 04, 2023 Version 8.16.0 </p></div>
+<div><p class="pubdate">Friday, September 01, 2023 Version 8.17.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -63,7 +63,7 @@
 <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">Send emails</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.3.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.3.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>
@@ -118,7 +118,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>
@@ -141,7 +141,7 @@
 <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.8.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.8.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p></li>
+<li class="listitem cap-deputy" id="id-1.1.6.2.2.1.8.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage 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.8.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.8.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
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 fc68056fe..30cf990bf 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.mailfilter.apply.html" title="Applying a rule to existing emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Email Settings">
 <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.mailfilter.apply.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.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.calendar.gui.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
index 18cb3ea99..622090a96 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.contacts.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.calendar.managedresources.administer.html" title="Administrating managed resources as booking delegate">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.settings.html" title="Calendar Settings">
 <link rel="next" href="ox.appsuite.user.sect.contacts.gui.html" title="The Address Book 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.calendar.managedresources.administer.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.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.contacts.gui.html">Next</a></li>
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 0506c3cc5..9727c169e 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.settings.html" title="DriveSettings">
+<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Setting up WebDAV under Windows">
 <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.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.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>
@@ -35,7 +35,7 @@
 <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.11.2.1.2"><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.11.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p></li>
+<li class="listitem cap-deputy" id="id-1.11.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage 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.11.2.1.5"><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.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></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 d4472ed43..c3ee65276 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.manage.delete.html" title="Deleting tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.search.html" title="Searching for 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.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.search.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 19b011434..a206f5e11 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.settings.html" title="Portal Settings">
+<link rel="prev" href="ox.appsuite.user.sect.portal.customize.createxing.html" title="Creating a Xing account">
 <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.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.portal.customize.createxing.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,7 +44,7 @@
 <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">Send emails</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.6.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 cap-switchboard" id="id-1.6.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>
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 0e4721b98..bb5029bff 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.html" title="Multi-Factor Authentication">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Managing verification methods">
 <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.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.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.portal.html b/help/l10n/en_US/ox.appsuite.user.chap.portal.html
index aaabd1406..cc44962b1 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.portal.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.portal.html
@@ -34,7 +34,7 @@
 <a class="indexterm" name="id-1.5.2"></a><p id="ox.appsuite.user.concept.portal">Learn how to use the <span class="phrase">Portal</span> app as central information source for new emails, scheduled appointments or tasks and news from social networks.</p>
 <div class="task" id="ox.appsuite.user.task.portal.start">
 <p class="title">How to start the <span class="phrase">Portal</span> app:</p>
-<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. Click on <span class="phrase"><span class="guibutton"><strong>Portal</strong></span></span> in the App Launcher.</p></li></ul></div>
+<div class="procedure"><ul class="procedure"><li class="step"><p role="presentation">Click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> in the menu bar. Click on <span class="phrase"><span class="guibutton"><strong>Portal</strong></span></span> in the App Launcher.</p></li></ul></div>
 </div>
 <p id="ox.appsuite.user.content.portal">Topics: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
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 beb28403b..7e5a8476b 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.security.html
@@ -6,8 +6,8 @@
 <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.downloadpersonaldata.html" title="Downloading Personal Data">
-<link rel="next" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
+<link rel="next" href="ox.appsuite.user.sect.security.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"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,10 +22,10 @@
 <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.downloadpersonaldata.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.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.autologout.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -40,14 +40,6 @@
 <p id="ox.appsuite.user.concept.security">Topics: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
-<p role="presentation">You can define whether you are automatically signed out.</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>
-<p role="presentation">You can define whether externally linked images in emails are automatically loaded and displayed.</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>
 <p role="presentation">You can display active clients and sign out of them if required.</p>
 </li>
@@ -55,10 +47,18 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a></p>
 <p role="presentation">You can create and manage additional passwords to use with other devices.</p>
 </li>
-<li class="listitem cap-multifactor" id="id-1.12.3.1.5">
+<li class="listitem cap-multifactor" id="id-1.12.3.1.3">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 <p role="presentation">You can set up a 2-step verification for the login.</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>
+<p role="presentation">You can define whether externally linked images in emails are automatically loaded and displayed.</p>
+</li>
+<li class="listitem">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a></p>
+<p role="presentation">You can define whether you are automatically signed out.</p>
+</li>
 </ul>
 <p role="presentation" class="cap-guard">In addition, you can encrypt your emails and files. Information on encryption can be found in <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Encrypting Data with <span class="phrase">Guard</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.settings.html b/help/l10n/en_US/ox.appsuite.user.chap.settings.html
index 46d449e78..b445d1327 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.settings.html
@@ -6,8 +6,8 @@
 <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.firststeps.mobile.html" title="Notes on Use on Mobile Devices">
-<link rel="next" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Adjusting the General Settings">
+<link rel="prev" href="ox.appsuite.user.sect.firststeps.keyboard.examples.html" title="Use cases">
+<link rel="next" href="ox.appsuite.user.sect.settings.search.html" title="Searching for Settings">
 <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"> 
@@ -22,10 +22,10 @@
 <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.firststeps.mobile.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.firststeps.keyboard.examples.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.settings.commonsettings.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.settings.search.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,12 +33,14 @@
 <div class="titlepage"><div><div><h1 class="title">Customized Settings</h1></div></div></div>
 <a class="indexterm" name="id-1.4.2"></a><p id="ox.appsuite.user.orientation.settings">Learn how to customize the groupware's design and behavior to fit your personal needs: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></p></li>
-<li class="listitem cap-switchboard" id="id-1.4.3.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></p></li>
+<li class="listitem cap-switchboard" id="id-1.4.3.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.settings"></p>
 <p class="title">Related topics:</p>
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 6da792cca..8c7319ccc 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.manage.delete.html" title="Deleting contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Address Book Settings">
 <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.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.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.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.9.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 d5a8e7f65..d158c1bd0 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.keys.pgppublickeys.html" title="Managing public keys">
+<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="GuardSettings">
 <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.keys.pgppublickeys.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.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>
 </ul></div>
@@ -58,7 +58,7 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">add attachments</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">add attachments</a>
 </dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
 <dt class="cap-webmail">from existing email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a>
 </dt>
@@ -206,7 +206,7 @@
 </dt>
 <dt class="cap-calendar">invite from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a>
 </dt>
-<dt class="cap-calendar">invite participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a>
+<dt class="cap-calendar">invite participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a>
 </dt>
 <dt class="cap-calendar">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
@@ -218,7 +218,7 @@
 </dt>
 <dt class="cap-calendar">reschedule to another day, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
-<dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
+<dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a>
 </dt>
 <dt class="cap-calendar">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
 </dt>
@@ -281,6 +281,8 @@
 </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>
 <dt class="cap-calendar">Detail view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.detailview.html">The Calendar detail view</a>
@@ -289,8 +291,12 @@
 </dt>
 <dt class="cap-calendar">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.foldertree.html">The Calendar folder view</a>
 </dt>
+<dt class="cap-calendar">import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+</dt>
 <dt class="cap-calendar">List view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.list.html">The Calendar list view</a>
 </dt>
+<dt class="cap-calendar">mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
+</dt>
 <dt class="cap-calendar">Mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
 </dt>
 <dt class="cap-calendar">New appointment button, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">The New appointment button</a>
@@ -303,27 +309,16 @@
 </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_google">subscribe to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</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">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="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-calendar_google">subscribe to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</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">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 scheduling view</a>
@@ -341,9 +336,11 @@
 </dt>
 <dt class="">automatically delete the invitation email after the appointment has been accepted or declined, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="cap-calendar">End of working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">Automatically mark all day appointments as “free”, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+</dt>
+<dt class="cap-calendar">end, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Free/Busy visibility, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">free/busy visibility, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">Jitsi meetings, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -353,7 +350,7 @@
 </dt>
 <dt class="">receive notification as appointment participant when other participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="">receive notifications when an appointment in which you participate is created, modified or deleted, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="">receive notifications when an appointment in which you participate is created, modified or deleted, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
 <dt class="cap-calendar">show birthday calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -361,7 +358,7 @@
 </dt>
 <dt class="cap-calendar">show reminders for past appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">Start of working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">start, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">subscribe to shared calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -488,7 +485,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>
@@ -510,7 +507,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>
 </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>
@@ -531,7 +528,7 @@
 </dt>
 <dt class="cap-deputy">edit, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html">Viewing, editing, deleting deputies</a>
 </dt>
-<dt class="cap-deputy">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a>
+<dt class="cap-deputy">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a>
 </dt>
 <dt class="cap-deputy">manage emails, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
 </dt>
@@ -706,8 +703,7 @@
 </dl></dd>
 <dt class="">editing window, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.create.html">The editing window</a>
 </dt>
-<dt class="">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
-</dt>
+<dt class="">email</dt>
 <dd><dl>
 <dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a>
 </dt>
@@ -729,16 +725,12 @@
 </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>
@@ -747,37 +739,27 @@
 </dt>
 <dt class="cap-guard">delete Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
-<dt class="cap-webmail">Detail view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.detailview.html">The Email detail view</a>
-</dt>
 <dt class="cap-webmail">disable or enable functional email accounts, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html">Disabling or enabling functional email accounts</a>
 </dt>
 <dt class="cap-webmail">display, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a>
 </dt>
 <dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
 </dt>
-<dt class="cap-deputy">edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
-</dt>
-<dt class="cap-webmail">editing window, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a>
-</dt>
 <dt class="cap-guard">encrypt incoming emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming emails by using a filter rule</a>
 </dt>
 <dt class="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 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>
@@ -789,14 +771,8 @@
 </dt>
 <dt class="cap-webmail">move, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a>
 </dt>
-<dt class="cap-webmail">New email button, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a>
-</dt>
 <dt class="">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>
-<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
-</dt>
 <dt class="cap-guard">read encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.read.html">Reading encrypted emails</a>
 </dt>
 <dt class="cap-webmail">reply, <a class="indexterm" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a>
@@ -813,8 +789,6 @@
 </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>
 <dt class="cap-guard">send encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a>
 </dt>
 <dt class="cap-webmail">send from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a>
@@ -825,20 +799,10 @@
 </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 class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
 </dt>
 <dt class="cap-guard">show Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
-<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
-</dt>
-<dt class="cap-webmail">tabs bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The Email tabs bar</a>
-</dt>
-<dt class="cap-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The 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">Unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</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>
@@ -858,11 +822,44 @@
 <dt class="cap-webmail">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
 </dt>
 </dl></dd>
-<dt class="cap-share_links cap-share_mail_attachments">email</dt>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
+</dt>
 <dd><dl>
-<dt class="">external images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</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-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-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-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">List view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The Email list view</a>
+</dt>
+<dt class="cap-webmail">New email button, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a>
+</dt>
+<dt class="cap-webmail">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">The Email pop-up</a>
+</dt>
+<dt class="cap-webmail">print, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
+</dt>
+<dt class="cap-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">settings, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
+<dt class="cap-webmail">show the email source, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a>
+</dt>
+<dt class="cap-webmail">tabs bar, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.tabs.html">The Email tabs bar</a>
+</dt>
+<dt class="cap-webmail">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.settingsmenu.html">The 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>
 </dl></dd>
 <dt class="cap-webmail">Email filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a>
@@ -893,6 +890,8 @@
 </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>
 <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>
@@ -901,28 +900,24 @@
 </dt>
 <dt class="cap-webmail">automatically send emails to BCC, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">color quoted lines, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
 <dt class="cap-webmail">compose dialog, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
-<dt class="cap-webmail">confirm recipients when replying to a mailing list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
-<dt class="cap-webmail">default font style, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">default text style, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </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">format emails as, <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>
 <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>
+<dt class="cap-webmail">message format, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+</dt>
 <dt class="cap-webmail">message list, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
 <dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
@@ -941,6 +936,8 @@
 </dt>
 <dt class="cap-webmail">show message size, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </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>
 <dt class="cap-webmail">show text preview, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
@@ -1063,7 +1060,7 @@
 </dt>
 <dt class="cap-infostore">lock, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a>
 </dt>
-<dt class="cap-infostore">Manage, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
+<dt class="cap-infostore">manage, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
 </dt>
 <dt class="cap-infostore">move, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.move.html">Moving files or Drive folders</a>
 </dt>
@@ -1166,7 +1163,7 @@
 <dt class="">General settings, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
 <dd><dl>
-<dt class="">accent colors, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+<dt class="">Accent colors, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
 <dt class="">backgrounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
@@ -1178,7 +1175,7 @@
 </dt>
 <dt class="feat-io-ox-core-categories">manage categories, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
 </dt>
-<dt class="">quick launch, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+<dt class="">quick launch bar, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
 <dt class="">start with, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
@@ -1250,6 +1247,9 @@
 <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-guard">Guard security settings</dt>
+<dd><dl><dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt></dl></dd>
 <dt class="cap-guard">Guardsecurity settings</dt>
 <dd><dl>
 <dt class="cap-guard">advanced settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
@@ -1260,8 +1260,6 @@
 </dt>
 <dt class="cap-guard">default to using PGP inline for new mails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">default to using S/MIME for signing and encryption, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
-</dt>
 <dt class="cap-guard">Remember password default, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 <dt class="cap-guard">S/MIME, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
@@ -1294,21 +1292,22 @@
 <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-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
-<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
 </dt>
 <dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 <dt class="cap-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
-</dt>
-<dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
 </dt>
 </dl></dd>
+<dt class="cap-tasks">Import</dt>
+<dd><dl><dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
+</dt></dl></dd>
 <dt class="cap-webmail">Inbox categories</dt>
 <dd><dl><dt class="cap-webmail">working with, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>
 </dt></dl></dd>
@@ -1357,7 +1356,7 @@
 </dt>
 <dt class="cap-multifactor">Login</dt>
 <dd><dl>
-<dt class="cap-multifactor">recover verification, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering the verification</a>
+<dt class="cap-multifactor">recover verification, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering verifications</a>
 </dt>
 <dt class="cap-multifactor">verify with authenticator app, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a>
 </dt>
@@ -1371,16 +1370,19 @@
 <div class="indexdiv">
 <h3>M</h3>
 <dl>
-<dt class="cap-webmail">Manage</dt>
+<dt class="cap-webmail">manage</dt>
 <dd><dl>
-<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
-</dt>
-<dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
-</dt>
 <dt class="cap-webmail">emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
 </dt>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
 </dt>
+</dl></dd>
+<dt class="cap-calendar">Manage</dt>
+<dd><dl>
+<dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
+</dt>
+<dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
+</dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a>
 </dt>
 </dl></dd>
@@ -1408,7 +1410,7 @@
 <dd><dl>
 <dt class="cap-multifactor">manage verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.manage.html">Managing verification methods</a>
 </dt>
-<dt class="cap-multifactor">set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a>
+<dt class="cap-multifactor">set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1418,13 +1420,13 @@
 <dl>
 <dt class="cap-webmail">New</dt>
 <dd><dl>
-<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 class="cap-tasks">add personal task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">add personal task list</a>
 </dt>
 <dt class="cap-contacts">address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a>
 </dt>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
 </dt>
-<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
+<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
 </dt>
@@ -1436,7 +1438,7 @@
 </dt>
 <dt class="cap-infostore">Drivefolders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Drive: Adding Folders</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: creating folders</a>
 </dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 <dt class="cap-webmail">Email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
 </dt>
@@ -1448,7 +1450,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>
@@ -1457,22 +1459,17 @@
 </dt>
 <dt class="">Notification area, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.notificationarea.html">The notification area</a>
 </dt>
-<dt class="">notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">Notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
 <dd><dl>
-<dt class="">automatically open notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">Open notification area automatically, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
 <dt class="">show desktop notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="">Use countdown for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
-</dt>
-</dl></dd>
-<dt class="">Notifications</dt>
-<dd><dl>
-<dt class="feat-io-ox-core-countdown">Use countdown for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
-</dt>
 <dt class="">use the notification area, <a class="indexterm" href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a>
 </dt>
+<dt class="">Using Countdowns for Appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+</dt>
 </dl></dd>
 </dl>
 </div>
@@ -1518,7 +1515,7 @@
 <dt class="cap-share_links cap-share_mail_attachments">viewer, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html">Which permissions can be used?</a>
 </dt>
 </dl></dd>
-<dt class="">Personal contact data, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
+<dt class="">personal contact data, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
 </dt>
 <dt class="">Personal contact picture, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
 </dt>
@@ -1666,7 +1663,7 @@
 </dt>
 <dt class="cap-calendar cap-switchboard">Schedule conference, audio/video, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a>
 </dt>
-<dt class="cap-webmail">Search</dt>
+<dt class="">Search</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a>
 </dt>
@@ -1676,6 +1673,8 @@
 </dt>
 <dt class="cap-infostore">files or folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a>
 </dt>
+<dt class="">settings, <a class="indexterm" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a>
+</dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a>
 </dt>
 </dl></dd>
@@ -1697,7 +1696,7 @@
 </dt>
 <dt class="cap-multifactor">multi-factor authentication, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
 </dt>
-<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
+<dt class="">Sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
 </dt>
 <dt class="">Using Application Passwords, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a>
 </dt>
@@ -1706,12 +1705,12 @@
 <dd><dl>
 <dt class="cap-contacts">contacts as vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a>
 </dt>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Set the presence status, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a>
 </dt>
-<dt class="cap-multifactor">Set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a>
+<dt class="cap-multifactor">Set up verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a>
 </dt>
 <dt class="">Settings</dt>
 <dd><dl>
@@ -1731,7 +1730,7 @@
 </dt>
 <dt class="">general settings, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
-<dt class="cap-deputy">manage deputies, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a>
+<dt class="cap-deputy">manage deputies, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a>
 </dt>
 <dt class="">notifications, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
@@ -1739,6 +1738,8 @@
 </dt>
 <dt class="cap-portal">Portal, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portal Settings</a>
 </dt>
+<dt class="">search, <a class="indexterm" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a>
+</dt>
 <dt class="cap-switchboard">set the presence status, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a>
 </dt>
 <dt class="">set up local apps with a wizard, <a class="indexterm" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a>
@@ -1778,7 +1779,7 @@
 </dt>
 <dt class="cap-contacts">subscribe to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared Drive folders</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">Subscribe to public and shared task lists</a>
+<dt class="cap-contacts">subscribe to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe 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>
@@ -1787,13 +1788,13 @@
 </dt>
 <dt class="">Sign in, sign out, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.login.html">Signing in, Signing out</a>
 </dt>
-<dt class="">sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
+<dt class="">Sign out automatically, <a class="indexterm" href="ox.appsuite.user.sect.security.autologout.html">Signing out Automatically</a>
 </dt>
 <dt class="cap-portal">Subscribe</dt>
 <dd><dl>
 <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">subscribe to Google calendars</a>
 </dt>
@@ -1832,9 +1833,9 @@
 </dt>
 <dt class="cap-tasks">add participant, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.participants.html">Adding participants to a task</a>
 </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 class="cap-tasks">add personal task list, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.personal.html">add personal task list</a>
 </dt>
-<dt class="cap-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>
@@ -1884,7 +1885,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">Subscribe to public and shared task lists</a>
+<dt class="cap-contacts">subscribe to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe 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>
@@ -1922,8 +1923,6 @@
 </dt></dl></dd>
 <dt class="">Usage on mobile devices, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a>
 </dt>
-<dt class="">Use countdown for appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</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="feat-io-ox-core-templates">Use templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Use templates</a>
@@ -1952,7 +1951,7 @@
 </dt>
 <dt class="">keyboard input, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.keyboard.html">Keyboard Input</a>, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.keyboard.shortcuts.html">Keys and key combinations</a>, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.keyboard.elements.html">Interacting with the user interface via keyboard</a>
 </dt>
-<dt class="">list view, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.list.html">The list view</a>
+<dt class="">List view, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.list.html">The list view</a>
 </dt>
 <dt class="">menu bar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.menubar.html">The menu bar</a>
 </dt>
@@ -1963,6 +1962,8 @@
 <dt class="">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.toolbar.html">The toolbar</a>
 </dt>
 </dl></dd>
+<dt class="">Using Countdowns for Appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>, <a class="indexterm" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a>
+</dt>
 </dl>
 </div>
 <div class="indexdiv">
@@ -1976,7 +1977,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 9674c9e7b..3b0125513 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
@@ -65,7 +65,7 @@
 <li class="listitem"><p role="presentation">schedule, edit or organize an other user’s appointments</p></li>
 </ul></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.deputy.html">Manage deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a></p>
 <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>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
index 587c2792e..2feab1955 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Inviting participants to a new appointment</title>
+<title>invite participants to a new appointment</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,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <h2 class="sr-only">create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
-<div class="titlepage"><div><div><h3 class="title">Inviting participants to a new appointment</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">invite participants to a new appointment</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">If an appointment has several participants, you can invite those participants to a new appointment.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.attendees">
 <p class="title">How to invite participants to a new appointment:</p>
@@ -62,7 +62,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.add.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index 13d8c1705..c11027af0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Resolving conflicts</title>
+<title>resolve conflicts</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,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <h2 class="sr-only">create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
-<div class="titlepage"><div><div><h3 class="title">Resolving conflicts</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">resolve conflicts</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">A conflict occurs when the following circumstances coincide: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.create.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.create.html
index 98dd3d1e5..baeca41c6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.create.html
@@ -102,10 +102,10 @@
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
 <p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p>
 <p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
index c2e3094e5..114c23e5f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the scheduling view">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="invite participants to a new appointment">
 <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"> 
@@ -59,7 +59,7 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.add.followup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
index 850217d65..cce12787e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
@@ -44,10 +44,10 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">add attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.hint.calendar.add">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
index 778978839..dfd5ad00a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviting email recipients to new appointments">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolving conflicts">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="resolve conflicts">
 <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"> 
@@ -45,7 +45,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.add.create.html">Creating new appointments</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.add.icalattachment">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html
index b99a6d14b..db0e98979 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.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.add.html" title="create appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="invite participants to a new appointment">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creating appointments from iCal attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -50,11 +50,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.calendar.add.create.html">Creating new appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.add.recipients">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
index 48341afc7..47a543d88 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.scheduling.html
@@ -38,7 +38,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.add.scheduling">
 <p class="title">How to use the scheduling view for creating appointments:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">You have the following possibilities to open the scheduling view: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step help-hide-inline"><p role="presentation">You have the following possibilities to open the scheduling view: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To use the scheduling view before creating a new appointment, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.scheduling.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Scheduling</strong></span>. The <span class="guilabel"><strong>Scheduling</strong></span> page opens.</p></li>
 <li class="listitem"><p role="presentation">To use the scheduling view while creating a new appointment or editing an existing appointment, click on <span class="guibutton"><strong>Find a free time</strong></span> in the appointment editing window. The <span class="guilabel"><strong>Scheduling</strong></span> window opens.</p></li>
 </ul></p></li>
@@ -86,10 +86,10 @@
 <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.add.create.html">Creating new appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">resolve conflicts</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Free/Busy visibility</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy">Show free/busy information to others</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.add.scheduling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">create appointments</a></p>
 </div>
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 bcfc25272..f5aa49bf1 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
@@ -63,7 +63,7 @@
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.deputy">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
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 f1aa9919e..c5c8b83cb 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
@@ -37,7 +37,7 @@
 <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">
-<li class="step">
+<li class="step help-hide-inline">
 <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.calendar.folder.import.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Import file</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.import.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Import file</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Import from file</strong></span> window opens.</p>
@@ -50,6 +50,10 @@
           <p>Note: All participants of the imported appointments will be removed. Instead, you will be added as participant.</p>
         </div>
 </div>
+<p role="presentation" class="feat-io-ox-core-dragDropICAL">Options: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">You can also import the appointments of a local iCAL file by dragging the iCAL file from a file browser or the desktop to the calendar view. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">The appointments of the iCAL file will be imported to the current calendar.</p></li>
+<li class="listitem"><p role="presentation">Existing appointments in the current calendar will be ignored. Thus the import can cause duplicates.</p></li>
+</ul></p></li></ul></p>
 <p id="ox.appsuite.user.related.calendar.folder.import"></p>
 <p class="title">User interface:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
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 44a820bc0..ca0b60e17 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
@@ -34,7 +34,7 @@
 <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.7.14.8.2"></a><a class="indexterm" name="id-1.7.14.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" id="ox.appsuite.user.task.calendar.folder.personal">
+<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">
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.personal.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new calendar</strong></span>.</p></li>
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 daa178120..db6dbff2e 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
@@ -43,12 +43,13 @@
 <div class="task" id="ox.appsuite.user.task.calendar.folder.subscribe">
 <p class="title">How to subscribe to external calendars:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <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.calendar.folder.subscribe.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Import from url</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Import from url</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Subscribe to iCal feed</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Enter an iCal url. Click on <span class="guibutton"><strong>Subscribe</strong></span>.</p></li>
+<li class="step"><p role="presentation">Enter an iCal url.</p></li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Subscribe</strong></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.options.calendar.folder.subscribe">Options: </p>
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 49b7cc0b0..ef54586bf 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
@@ -45,7 +45,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.folder.subscribeshared">
 <p class="title">How to define the calendars to which you want to subscribe and which are to be synchronized:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <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.calendar.folder.subscribeshared.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Subscribe shared Calendar</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">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribeshared.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Subscribe shared Calendar</strong></span>.</p></li>
@@ -56,8 +56,8 @@
 <li class="step">
 <p role="presentation">If you want a calendar to be displayed, enable the <span class="guibutton"><strong>Subscribe to calendar</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribeshared.off"><object type="image/svg+xml" data="../../images/toggle-off.svg" height="15"></object></span>.</p>
 <p role="presentation">To define that a displayed calendar is synchronized, enable the <span class="guibutton"><strong>Synchronize via DAV</strong></span> checkbox.</p>
-<p role="presentation">If you no longer want a calendar to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to calendar</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span>.</p>
 </li>
+<li class="step"><p role="presentation">If you no longer want a calendar to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to calendar</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.folder.subscribeshared"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 8860ca69b..331f2fc87 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -65,7 +65,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 <p role="presentation" class="cap-webmail"><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.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
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 8a7d50aa1..8a9ac36a6 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
@@ -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.add.conflicthandling.html" title="Resolving conflicts">
+<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="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -35,7 +35,7 @@
 <a class="indexterm" name="id-1.7.11.2"></a><p id="ox.appsuite.user.orientation.calendar.invitation">Learn how to reply to an appointment invitation if you are being added to an appointment.</p>
 <p id="ox.appsuite.user.concept.calendar.invitation">You will receive one of the following notifications: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">You will be informed about this appointment in the Notification area.</p></li>
+<li class="listitem"><p role="presentation">You are informed about this appointment in the Notification area.</p></li>
 <li class="listitem"><p role="presentation">You will receive an email invitation for the appointment.</p></li>
 </ul>
 <p> You can respond to the invitation with <span class="guibutton"><strong>Confirm</strong></span>, <span class="guibutton"><strong>Maybe</strong></span> or <span class="guibutton"><strong>Decline</strong></span>. You can always change the status later.</p>
@@ -43,7 +43,7 @@
 <p class="title">How to answer an appointment invitation in the notification area:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.invitation.unreadbadge"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The notification area opens. Appointment invitations will be displayed below <span class="guibutton"><strong>Invitations</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.invitation.unreadbadge"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The info area opens. Appointment invitations will be displayed below <span class="guibutton"><strong>Invitations</strong></span>.</p>
 <p role="presentation">To display the suggested appointment in the calendar, click on the date below the appointment title.</p>
 </li>
 <li class="step"><p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
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 18541a750..d5ee2c734 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
@@ -37,19 +37,17 @@
 <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">
-<li class="step">
+<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.calendar.manage.timezones.favorites.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane. Click on <span class="guibutton"><strong>Additional time zones</strong></span>.</p></li>
+<li class="step help-hide-inline"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane. Click on <span class="guibutton"><strong>Additional time zones</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Select a time zone <span class="guibutton"><strong> in Select time zone</strong></span> Click on <span class="guibutton"><strong>Add time zone</strong></span>.</p>
+<p role="presentation">Select a time zone in <span class="guibutton"><strong>Select time zone</strong></span>. Click on <span class="guibutton"><strong>Add time zone</strong></span>.</p>
 <p role="presentation">The additional time zones will be displayed in the list of favorites below <span class="guibutton"><strong>Select time zone</strong></span>.</p>
 </li>
+<li class="step"><p role="presentation">To remove a timezone from the list of favorites, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.timezones.favorites.delete"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the timezone.</p></li>
 </ol></div>
-<div class="taskrelated">
-          <p>To remove a timezone from the list of favorites, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.timezones.favorites.delete"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the timezone.</p>
-        </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.timezones"></p>
 <p class="title">Related topics:</p>
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 e00bba5ae..8b6ae6f7d 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
@@ -45,7 +45,7 @@
 <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">Display an email with a booking request in the <span class="phrase">Email</span> application.</p></li>
 <li class="listitem">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.managedresources.reply"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The notification area opens. Booking requests for managed resources will be displayed below <span class="guibutton"><strong>Resource booking requests</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.managedresources.reply"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The info area opens. Booking requests for managed resources will be displayed below <span class="guibutton"><strong>Resource booking requests</strong></span>.</p>
 <p role="presentation">To view the booking request in the resource calendar, click on the date below the title.</p>
 </li>
 </ul></p></li>
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 434a47067..57f32cb83 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,8 +32,8 @@
   <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.7.22.2"></a><a class="indexterm" name="id-1.7.22.3"></a><div class="task" id="ox.appsuite.user.task.calendar.settings">
-<p class="title">How to use the calendar settings:</p>
+<a class="indexterm" name="id-1.7.22.2"></a><a class="indexterm" name="id-1.7.22.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">
 <p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.settings"><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>
@@ -42,43 +42,41 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings">Depending on the configuration, the following settings are 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.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"><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.7.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.7.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"><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>
 <p id="ox.appsuite.user.reference.calendar.settings.yourweek"></p>
 <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.7.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.7.22.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 of working time. </b><a class="indexterm" name="id-1.7.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 of working time. </b><a class="indexterm" name="id-1.7.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.start"><b>Start. </b><a class="indexterm" name="id-1.7.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.7.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.7.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>
 </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.7.22.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>Week start. </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>Workweek length. </b>Defines the number of days of a work week.</p></li>
+<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>
 </ul>
 <p> See <a class="xref" href="ox.appsuite.user.sect.calendar.gui.calendarview.html">Day, Work week, Week, Month or Year calendar view.</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.reference.calendar.settings.reminder"></p>
-<h3 class="title">appointment reminders</h3>
+<h3 class="title">Appointment reminders</h3>
 <p><a class="indexterm" name="id-1.7.22.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 time when creating the following appointments: </p>
+<p role="presentation">Default reminder when newly creating the following appointments: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">normal appointments or recurring appointments</p></li>
 <li class="listitem"><p role="presentation">all day appointments</p></li>
@@ -117,7 +115,7 @@
 <h3 class="title">Advanced settings</h3>
 <p><a class="indexterm" name="id-1.7.22.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.7.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.birthdaycalendar"><b>show birthday calendar. </b><a class="indexterm" name="id-1.7.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.7.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.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.7.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>
@@ -127,12 +125,12 @@
 <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>Free/Busy visibility. </b><a class="indexterm" name="id-1.7.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 scheduling view</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.7.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 scheduling 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.7.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.7.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>Participants can edit appointments. </b><a class="indexterm" name="id-1.7.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>Marking all day appointments as free. </b><a class="indexterm" name="id-1.7.22.11.3.1.8.1.2"></a>Defines whether all day appointments are displayed as free as default.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.7.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.7.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.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.7.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.7.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.7.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.7.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>
 </ul>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
 <p class="title">Related topics:</p>
@@ -142,7 +140,10 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.settings">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.contacts.folder.managesubscribed.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
index 6a1bfea3d..775de32a8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.managesubscribed.html
@@ -43,11 +43,14 @@
 <div class="task" id="ox.appsuite.user.task.contacts.folder.managesubscribed">
 <p class="title">How to manage address book subscriptions:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.contacts.folder.managesubscribed.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane. Click on <span class="guibutton"><strong>Subscriptions</strong></span> in the right pane.</p></li>
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Subscriptions</strong></span> in the right pane.</p>
+</li>
 <li class="step"><p role="presentation">Use the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To refresh an address book subscription, click on <span class="guibutton"><strong>Refresh</strong></span> next to a subscription.</p></li>
 <li class="listitem">
@@ -61,7 +64,10 @@
 </div>
 <p id="ox.appsuite.user.related.contacts.folder.managesubscribed"></p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; ">
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
+</ul>
 <p id="ox.appsuite.user.parent.contacts.folder.managesubscribed">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.folder.html">Adding Address Book</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
index 363797420..c328b9221 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.personal.html
@@ -34,7 +34,7 @@
 <div class="sect2" id="ox.appsuite.user.sect.contacts.folder.personal">
 <div class="titlepage"><div><div><h3 class="title">Adding personal address books</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.8.2"></a><a class="indexterm" name="id-1.8.16.8.3"></a><p id="ox.appsuite.user.concept.contacts.folder.personal">You can create additional personal address books below My address books.</p>
-<div class="task" id="ox.appsuite.user.task.contacts.folder.personal">
+<div class="task help-hide-inline" id="ox.appsuite.user.task.contacts.folder.personal">
 <p class="title">How to create a new personal address book:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.personal.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My address books</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new address book</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
index 1398fe608..9ee91a7ca 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribe.html
@@ -42,12 +42,13 @@
 <div class="task" id="ox.appsuite.user.task.contacts.folder.subscribe">
 <p class="title">How to subscribe to external address books:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <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.contacts.folder.subscribe.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New contact</strong></span>. Click on <span class="guibutton"><strong>Subscribe address book</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.subscribe.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Subscribe address book</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Subscribe to address book</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click one of the icons. Depending on the data source, the further procedure varies. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step"><p role="presentation">Click one of the icons.</p></li>
+<li class="step"><p role="presentation">Depending on the data source, the further procedure varies. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">For some data sources, a new browser window opens. Log in with your credentials to grant access to the address data.</p></li>
 <li class="listitem"><p role="presentation">If the provider asks you for the permission to access the data, grant this permission.</p></li>
 <li class="listitem"><p role="presentation">For some data sources, you have to enter your credentials for the data source in the <span class="guilabel"><strong>Subscribe to address book</strong></span> window.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
index ca9d0e8bb..b0cd3fe4e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.folder.subscribeshared.html
@@ -45,8 +45,8 @@
 <div class="task" id="ox.appsuite.user.task.contacts.folder.subscribeshared">
 <p class="title">How to define the address books to which you want to subscribe and which are to be synchronized:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<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.contacts.folder.subscribeshared.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New contact</strong></span>. Click on <span class="guibutton"><strong>Subscribe to shared address books</strong></span>.</p>
+<li class="step help-hide-inline">
+<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.contacts.folder.subscribeshared.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New contact</strong></span>. Click on <span class="guibutton"><strong>Subscribe shared address books</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">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.subscribeshared.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Subscribe shared address books</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">You can also use the <span class="guibutton"><strong>Subscribe to shared address books</strong></span> button in the address book settings below <span class="guibutton"><strong>Advanced settings</strong></span>.</p></li>
@@ -56,8 +56,8 @@
 <li class="step">
 <p role="presentation">If you want an address book to be displayed, enable the <span class="guibutton"><strong>Subscribe to address book</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.subscribeshared.off"><object type="image/svg+xml" data="../../images/toggle-off.svg" height="15"></object></span>.</p>
 <p role="presentation">To define that a displayed address book is synchronized, enable the <span class="guibutton"><strong>Synchronize via DAV</strong></span> checkbox.</p>
-<p role="presentation">If you no longer want an address book to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to address book</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span>.</p>
 </li>
+<li class="step"><p role="presentation">If you no longer want an address book to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to address book</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.contacts.folder.subscribeshared"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html
index 15d3586bc..f6b789edb 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.contacts.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Address Book Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.8.19.2"></a><a class="indexterm" name="id-1.8.19.3"></a><a class="indexterm" name="id-1.8.19.4"></a><div class="task" id="ox.appsuite.user.task.contacts.settings">
+<a class="indexterm" name="id-1.8.19.2"></a><a class="indexterm" name="id-1.8.19.3"></a><a class="indexterm" name="id-1.8.19.4"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.contacts.settings">
 <p class="title">How to use the address book settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
@@ -42,17 +42,15 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Address Book</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.contacts.settings">Depending on the configuration, the following settings are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html#ox.appsuite.user.reference.contacts.settings.namesadresses">Names &amp; addresses</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html#ox.appsuite.user.reference.contacts.settings.namesadresses">Names &amp; Addresses</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html#ox.appsuite.user.reference.contacts.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.contacts.settings.namesadresses"></p>
-<h3 class="title">Names &amp; addresses</h3>
+<h3 class="title">Names &amp; Addresses</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p id="ox.appsuite.user.reference.contacts.settings.namesadresses.displaynames"><b>Names. </b><a class="indexterm" name="id-1.8.19.7.2.1.1.1.2"></a></p>
@@ -71,14 +69,17 @@
 <p id="ox.appsuite.user.reference.contacts.settings.advanced.defaultaddressbook"><b>Start in “All users” address book. </b><a class="indexterm" name="id-1.8.19.8.3.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Defines the address book that is opened as default after having logged in.</p></li></ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.contacts.settings.advanced.usedforsync"><b>Subscribe to shared address books. </b>See <a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.contacts.settings.advanced.usedforsync"><b>Subscribing to shared address books. </b>See <a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.contacts.settings"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.gui.settingsmenu.html">The <span class="phrase">Address Book</span> settings menu</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.settings">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 c6a9a2087..b9337a3f8 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
@@ -36,7 +36,7 @@
 <div class="task" id="ox.appsuite.user.task.contacts.useaddressbook">
 <p class="title">How to automatically add email addresses from an address book:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <p role="presentation">Click the <span class="guibutton"><strong>Select contacts</strong></span> icon in an editing window. <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.useaddressbook.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span></p>
 <p role="presentation">This icon will be available in the input fields for email addresses, while: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">selecting the recipients when sending an email</p></li>
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 ab5f566a1..20ed49c17 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
@@ -44,12 +44,13 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.accounts.edit">
 <p class="title">How to view, edit or delete accounts:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.accounts.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>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane. Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Edit</strong></span> next to an account. The settings are displayed in an editing window.</p>
 <p role="presentation">If you use several services from the selected provider, the editing window shows an overview of the services.</p>
 </li>
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 d6fe9d25e..93c6804fa 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
@@ -38,10 +38,13 @@
 <p class="title">How to disable or enable functional email accounts:</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.accounts.functionalmail.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>General</strong></span>.</p>
+<p role="presentation" class="help-hide-inline">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.accounts.functionalmail.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>General</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane. Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p>
+</li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Disable</strong></span> next to the functional email account.</p>
 <p role="presentation">The email account will no longer be displayed in the folder view.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.html
index 171b22812..72bced51d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.html
@@ -45,6 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Editing the primary email account</a></p></li>
 <li class="listitem"><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"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Viewing, editing, deleting accounts</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>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.accounts">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.accounts.primarymail.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
index d8d4de1c6..82db4b06a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html
@@ -43,11 +43,14 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.accounts.primarymail">
 <p class="title">How to edit the primary email account:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.accounts.primarymail.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane. Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p></li>
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Your accounts</strong></span>.</p>
+</li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Edit</strong></span> next to the primary email account. The <span class="guilabel"><strong>Edit mail account</strong></span> window displays the current settings.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
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 4842556b4..a501fbf35 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
@@ -50,20 +50,18 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.categories">
 <p class="title">How to manage your categories:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <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>
 <p role="presentation">The <span class="guilabel"><strong>Manage categories</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">You have the following options: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<li class="step">
 <p role="presentation">To create a new category, click on <span class="guibutton"><strong>New category</strong></span>.</p>
 <p role="presentation">Enter a name in the <span class="guilabel"><strong>New category</strong></span> window. Select a color and an icon.</p>
 </li>
-<li class="listitem"><p role="presentation">In order to edit a category, click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> next to the category.</p></li>
-<li class="listitem"><p role="presentation">In order to delete a category, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
-</ul></p></li>
+<li class="step"><p role="presentation">In order to edit a category, click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.edit"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> next to the category.</p></li>
+<li class="step"><p role="presentation">In order to delete a category, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.dataorganisation.categories"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.add.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.add.html
index d849b33ba..b1d2fd426 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.add.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.dataorganisation.deputy.html" title="Manage deputies">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Manage deputies">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.edit.html" title="Viewing, editing, deleting deputies">
 <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">Data Organization and Shares</h1>
-<h2 class="sr-only">Manage deputies</h2>
+<h2 class="sr-only">manage deputies</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.add">
 <div class="titlepage"><div><div><h3 class="title">Adding deputies</h3></div></div></div>
 <a class="indexterm" name="id-1.11.6.8.2"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.add">The following options exist: </p>
@@ -42,7 +42,7 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.deputy.add">
 <p class="title">How to set one or more deputies:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.deputy.add.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>.</p>
 <p role="presentation">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 deputies</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span></p>
@@ -81,7 +81,7 @@
 <p id="ox.appsuite.user.related.dataorganisation.deputy.add"></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.deputy.edit.html">Viewing, editing, deleting deputies</a></p></li></ul>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.add">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
index 072addbe6..73ff3f4e6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.edit.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.dataorganisation.deputy.html" title="Manage deputies">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.deputy.add.html" title="Adding deputies">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Managing Accounts">
 <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">Data Organization and Shares</h1>
-<h2 class="sr-only">Manage deputies</h2>
+<h2 class="sr-only">manage deputies</h2>
 <div class="sect2" id="ox.appsuite.user.sect.dataorganisation.deputy.edit">
 <div class="titlepage"><div><div><h3 class="title">Viewing, editing, deleting deputies</h3></div></div></div>
 <a class="indexterm" name="id-1.11.6.9.2"></a><a class="indexterm" name="id-1.11.6.9.3"></a><a class="indexterm" name="id-1.11.6.9.4"></a><p id="ox.appsuite.user.concept.dataorganisation.deputy.edit">The following options exist: </p>
@@ -43,7 +43,7 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.deputy.edit">
 <p class="title">How to view, edit or delete deputies:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.deputy.edit.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>.</p>
 <p role="presentation">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>Advanced Settings</strong></span> in the left pane. Click on <span class="guibutton"><strong>Manage deputies</strong></span>.</p>
@@ -59,26 +59,24 @@
 </ul></p>
 <p role="presentation">The <span class="guilabel"><strong>Manage deputies</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">The following options exist: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem">
+<li class="step">
 <p role="presentation">To add a deputy, enter the deputy’s email address in <span class="guibutton"><strong>Add people</strong></span>.</p>
 <p role="presentation">To select deputies 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.dataorganisation.deputy.edit.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>
-<li class="listitem">
+<li class="step">
 <p role="presentation">To change a deputy’s permissions, click on <span class="guibutton"><strong>Edit</strong></span> next to the deputy.</p>
 <p role="presentation">Change the permissions in the <span class="guilabel"><strong>Deputy</strong></span> window.</p>
 </li>
-<li class="listitem">
+<li class="step">
 <p role="presentation">To remove a deputy, click the <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.deputy.edit.remove"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the deputy.</p>
 <p role="presentation">Confirm that you want to remove the deputy.</p>
 </li>
-</ul></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.dataorganisation.deputy.edit"></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.deputy.add.html">Adding deputies</a></p></li></ul>
-<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p>
+<p id="ox.appsuite.user.parent.dataorganisation.deputy.edit">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.html
index 658e06888..640aff8ce 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.deputy.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Manage deputies</title>
+<title>manage deputies</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Organization and Shares</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.deputy">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Manage deputies</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">manage deputies</h2></div></div></div>
 <a class="indexterm" name="id-1.11.6.2"></a><a class="indexterm" name="id-1.11.6.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.deputy">You can appoint other users to act as your <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. You can grant one or multiple deputies different permission levels to handle the email communication and appointment scheduling in your name.</p>
 <p id="ox.appsuite.user.concept.dataorganisation.deputy">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html
index 291584920..5a06e78a0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html
@@ -47,7 +47,7 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.downloadpersonaldata">
 <p class="title">How to download your personal data:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.downloadpersonaldata.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
@@ -123,7 +123,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribe to public and shared task lists</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.downloadpersonaldata">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.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.html
index d42265c27..7978f3a4d 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 Book</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.folder.kind.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.kind.html
index fd8ba16ae..61108695f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.kind.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.kind.html
@@ -69,7 +69,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.personal.html">Adding personal address books</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adding personal task list</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">add personal task list</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: creating folders</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
index ca63d8bed..ca43d809e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
@@ -65,7 +65,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribe to public and shared task lists</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.examples.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
index e306ba5f8..ff54c5db8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.examples.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.sharing.html" title="Sharing Data">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.sharing.permissions.html" title="Which permissions can be used?">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="Manage deputies">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.deputy.html" title="manage deputies">
 <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.dataorganisation.sharing.subscribeimap.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html
index 80e0ed011..03b99908b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html
@@ -37,12 +37,12 @@
 <div class="task" id="ox.appsuite.user.task.dataorganisation.sharing.subscribeimap">
 <p class="title">How to subscribe to personal or shared email folders:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.sharing.subscribeimap.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Change IMAP subscriptions</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">In the <span class="guilabel"><strong>Subscribe IMAP folders</strong></span> window enable the checkboxes of the folders that you want to subscribe to. Click on <span class="guibutton"><strong>Save</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
index e050873eb..3179981ff 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
@@ -36,7 +36,7 @@
 <div class="titlepage"><div><div><h3 class="title">
 <span class="phrase">Drive</span>: creating folders</h3></div></div></div>
 <a class="indexterm" name="id-1.10.10.7.2"></a><a class="indexterm" name="id-1.10.10.7.3"></a><p id="ox.appsuite.user.concept.drive.folder.personal">You can create new folders in the current folder.</p>
-<div class="task" id="ox.appsuite.user.task.drive.folder.personal.createfolder">
+<div class="task help-hide-inline" id="ox.appsuite.user.task.drive.folder.personal.createfolder">
 <p class="title">How to create a new folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">In the folder view, open a <span class="phrase">Drive</span> folder for which you have the permission to create objects.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.settings.html
index a1100d409..c9a1af328 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.settings.html
@@ -33,8 +33,8 @@
 <div class="sect1" id="ox.appsuite.user.sect.drive.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <span class="phrase">Drive</span>Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.10.17.2"></a><a class="indexterm" name="id-1.10.17.3"></a><div class="task" id="ox.appsuite.user.task.drive.settings">
-<p class="title">How to use the <span class="phrase">Drive</span> settings:</p>
+<a class="indexterm" name="id-1.10.17.2"></a><a class="indexterm" name="id-1.10.17.3"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.drive.settings">
+<p class="title">How to open the <span class="phrase">Drive</span> settings:</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.drive.settings"><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>
@@ -43,9 +43,6 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Drive</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.drive.settings">Depending on the configuration, the following settings are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -53,6 +50,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.versionhistory">Version history</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.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.drive.settings.adddrive"></p>
 <h3 class="title">add files</h3>
 <p><a class="indexterm" name="id-1.10.17.6.2"></a>Defines whether a new file or a new version of a possibly existing file with the same name should be created. </p>
@@ -78,7 +76,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.drive.gui.settingsmenu.html">The <span class="phrase">Drive</span> settings menu</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.settings">Parent topic: <a class="xref" href="ox.appsuite.user.chap.drive.html"><i><span class="phrase">Drive</span></i></a></p>
 </div>
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 29b0077b1..e2a9be27c 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="Send 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.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
index bb3f99567..829d85ec3 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,12 +86,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"><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.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">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.deputy">Parent topic: <a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">Email</span></i></a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
index d394eac04..da46e39ca 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
@@ -32,8 +32,9 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.folder">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Adding Email Folders</h2></div></div></div>
-<a class="indexterm" name="id-1.6.14.2"></a><a class="indexterm" name="id-1.6.14.3"></a><p id="ox.appsuite.user.orientation.email.folder">With email folders you can organize your emails, e.g. by separately saving emails for customers or projects. Learn how to create additional email folders below your primary email account.</p>
-<div class="task" id="ox.appsuite.user.task.email.folder.">
+<a class="indexterm" name="id-1.6.14.2"></a><a class="indexterm" name="id-1.6.14.3"></a><p role="presentation" class="help-hide-inline">Learn how to create additional email folders below your primary email account.</p>
+<p id="ox.appsuite.user.concept.email.folder">With email folders you can organize your emails, e.g. by separately saving emails for customers or projects.</p>
+<div class="task help-hide-inline" id="ox.appsuite.user.task.email.folder.">
 <p class="title">How to create a new email folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
index a9abea246..759261d13 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
@@ -42,11 +42,11 @@
 <div class="task" id="ox.appsuite.user.task.email.mailfilter.change">
 <p class="title">How to change existing rules:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.email.mailfilter.change.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Filter rules</strong></span>.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Filter rules</strong></span>.</p></li>
 <li class="step"><p role="presentation">To edit a rule's settings, click on <span class="guibutton"><strong>Edit</strong></span> next to the rule. Change the settings in the <span class="guilabel"><strong>Edit rule</strong></span> window.</p></li>
 <li class="step">
 <p role="presentation">To disable a rule, click on <span class="guibutton"><strong>Disable</strong></span> next to the rule.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
index 05fb84622..28ae6fca1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
@@ -42,7 +42,7 @@
 <div class="task" id="ox.appsuite.user.task.email.mailfilter.create">
 <p class="title">How to create a new rule:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.email.mailfilter.create.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
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 d17046726..f0ea55382 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
@@ -68,7 +68,7 @@
 <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">Send emails</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>
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 02567a1ce..c8c4439b4 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
@@ -45,7 +45,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <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>Inbox categories</strong></span> button below <span class="guibutton"><strong>Reading</strong></span> in the email settings.</p></li></ul>
+<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>
 </li>
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 7eea159e1..840967da0 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
@@ -42,7 +42,7 @@
 <p class="title">How to use AI for composing an email:</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></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Write or rephrase text</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.openai.send"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span> in the toolbar of the email editing window. The <span class="guilabel"><strong>Generate content</strong></span> window opens.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Write or rephrase text</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.openai.send"><object type="image/svg+xml" data="../../images/cpu.svg" height="15"></object></span> in the toolbar of the email editing window. The <span class="guilabel"><strong>Generate contents</strong></span> window opens.</p></li>
 <li class="step">
 <p role="presentation">In <span class="guibutton"><strong>Your input</strong></span>, enter words or formulations. Click on <span class="guibutton"><strong>Generate</strong></span>.</p>
 <p role="presentation">After a short delay, the result will be displayed below <span class="guilabel"><strong>Generated response</strong></span>.</p>
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 408a0b3d0..b6a1476fe 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,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="Send 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="add attachments">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
 <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">Send 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.6.11.9.2"></a><a class="indexterm" name="id-1.6.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>
@@ -61,7 +61,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending 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">Send 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 618090366..4c3330d57 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
@@ -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="Send 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="Use templates">
 <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">Send 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>
 <a class="indexterm" name="id-1.6.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>
@@ -91,7 +91,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">add 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">Send 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 7bfd1652b..b864ff190 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="Send 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">Send 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">add attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.8.2"></a><a class="indexterm" name="id-1.6.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>
@@ -64,7 +64,7 @@
 <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>
 </li></ul>
-<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>
+<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 bb30b38f9..38a140572 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="Send 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,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Send 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.6.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
@@ -55,7 +55,7 @@
 </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>
 </ul>
-<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>
+<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 3bd5de19b..d183a8602 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="Send 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,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Send 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.6.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let emails be automatically forwarded to another address.</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">Send 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 7c7c6bd56..30102a052 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="Send 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,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Send 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.6.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>
@@ -73,7 +73,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.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">Send 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 30c4f3bcc..d1a74feab 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,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Send 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">
@@ -31,7 +31,7 @@
 <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">Send 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>
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 b9b10a7b3..6424c9aab 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
@@ -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="Send emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Send 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.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"​/> 
@@ -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">Send 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>
 <a class="indexterm" name="id-1.6.11.5.2"></a><a class="indexterm" name="id-1.6.11.5.3"></a><a class="indexterm" name="id-1.6.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
@@ -116,12 +116,9 @@
 <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.6.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" 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.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.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">Send 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 74efc7a60..747b32298 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,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="Send 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.signatures.html" title="Using signatures">
 <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">
@@ -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">Send 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.6.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>
@@ -71,7 +71,7 @@
 </li>
 <li class="listitem feat-io-ox-core-openai" id="id-1.6.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>
 </ul>
-<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>
+<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 002f93e56..db81fb7a4 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,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="Send 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.sender.html" title="select a sender address">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="add attachments">
 <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">Send 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.6.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>
@@ -56,7 +56,7 @@
 <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">Send 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 c312bee58..17df22c30 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
@@ -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="Send 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.new.html" title="Sending a new email">
 <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">
@@ -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">Send 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">select a sender address</h3></div></div></div>
 <a class="indexterm" name="id-1.6.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>
@@ -58,7 +58,7 @@
 <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">Send 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 4ce84fe99..d60cff1e5 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,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="Send 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.reply.html" title="Replying to 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">Send 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.6.11.12.2"></a><a class="indexterm" name="id-1.6.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>
@@ -42,12 +42,12 @@
 <div class="task" id="ox.appsuite.user.task.email.send.signatures.addmanage">
 <p class="title">How to create or edit a signature:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.email.send.signatures.addmanage.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Signatures</strong></span>. The existing signatures will be shown.</p>
 </li>
 <li class="step">
@@ -94,7 +94,7 @@
 <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">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">Send 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 d886c8301..a1092c45f 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
@@ -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="Send 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.attachmentlink.html" title="Sending 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">
@@ -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">Send 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">Use templates</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.11.2"></a><a class="indexterm" name="id-1.6.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>
@@ -48,7 +48,7 @@
 <div class="task" id="ox.appsuite.user.task.email.send.templates.addmanage">
 <p class="title">How to create or edit a template:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.email.send.templates.addmanage.settings"><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>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Templates</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Insert template</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.templates.addmanage.templates"><object type="image/svg+xml" data="../../images/file-text.svg" height="15"></object></span> in the email editing window. Click on <span class="guibutton"><strong>Edit templates</strong></span>.</p>
@@ -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">Send 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 886a779fb..0a10dfe64 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,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="Send 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="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">Send 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.6.11.17.2"></a><a class="indexterm" name="id-1.6.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>
@@ -83,7 +83,7 @@
 </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">Send 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 4481a29a1..94f6b7010 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
@@ -32,8 +32,8 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Email Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.6.20.2"></a><a class="indexterm" name="id-1.6.20.3"></a><div class="task" id="ox.appsuite.user.task.email.settings">
-<p class="title">How to use the general E-Mail settings:</p>
+<a class="indexterm" name="id-1.6.20.2"></a><a class="indexterm" name="id-1.6.20.3"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.email.settings">
+<p class="title">How to open the E-Mail settings:</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.settings"><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>
@@ -42,9 +42,6 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.email.settings">Depending on the configuration, the following settings are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -56,28 +53,29 @@
 <li class="listitem feat-zoom" id="id-1.6.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.6.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>
 </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.6.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.6.20.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Message list. </b><a class="indexterm" name="id-1.6.20.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.email.settings.reading.messagelist.list"><b>Contact pictures, checkboxes, simple. </b>Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
 <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.6.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>Show date and time. </b><a class="indexterm" name="id-1.6.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.6.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"><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.6.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.6.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>
 </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.6.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>Color quoted lines. </b><a class="indexterm" name="id-1.6.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 text mails. </b><a class="indexterm" name="id-1.6.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>
+<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.6.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.6.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.6.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.6.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.6.20.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.6.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>
@@ -87,8 +85,8 @@
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.reading.specialfolders"><b>Special folders. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.specialfolders.unreadfolder"><b>show folder with all unseen messages. </b><a class="indexterm" name="id-1.6.20.6.2.1.5.1.2.1.1.1.2"></a>Defines whether the <span class="guibutton"><strong>Unread </strong></span> folder is displayed in the folder view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.specialfolders.markedfolder"><b>show folder with all flagged messages. </b><a class="indexterm" name="id-1.6.20.6.2.1.5.1.2.1.2.1.2"></a>Defines whether the <span class="guibutton"><strong>Flagged </strong></span> folder is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.specialfolders.unreadfolder"><b>Show folder “Unseen” that lists all unread messages. </b><a class="indexterm" name="id-1.6.20.6.2.1.5.1.2.1.1.1.2"></a>Defines whether the <span class="guibutton"><strong>Unread </strong></span> folder is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.specialfolders.markedfolder"><b>Show folder “Flagged” that lists all flagged messages. </b><a class="indexterm" name="id-1.6.20.6.2.1.5.1.2.1.2.1.2"></a>Defines whether the <span class="guibutton"><strong>Flagged </strong></span> folder is displayed in the folder view.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.inboxcategories"><b>Inbox categories. </b>See <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a></p></li>
@@ -100,14 +98,14 @@
 <h3 class="title">Compose &amp; Reply</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose"><b>compose dialog. </b><a class="indexterm" name="id-1.6.20.8.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose"><b>Compose dialog. </b><a class="indexterm" name="id-1.6.20.8.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p id="ox.appsuite.user.reference.email.settings.composereply.compose.sender"><b>Default sender address. </b>Specifies the pre-set sender address for new emails.</p>
 <p role="presentation">Note: The sender's name is displayed in front of the sender address. If you enter a name in the <span class="guibutton"><strong>Your name</strong></span> input field in the account settings, this name overwrites the preset sender name.</p>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.composereply.compose.format"><b>Format emails as. </b><a class="indexterm" name="id-1.6.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.6.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>
@@ -116,7 +114,7 @@
 </li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.font"><b>Default font style. </b><a class="indexterm" name="id-1.6.20.8.2.1.2.1.2"></a>Defines the preset font style for email text in html format.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.font"><b>Default text style. </b><a class="indexterm" name="id-1.6.20.8.2.1.2.1.2"></a>Defines the preset font style for email text in html format.</p></li>
 <li class="listitem"><div id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend" class="feat-io-ox-core-undoSend">
 <p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend"><b>Undo send. </b><a class="indexterm" name="id-1.6.20.8.2.1.3.1.2"></a>Defines whether emails will be sent immediately or with a short delay. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -143,7 +141,7 @@
 <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 HTML formatted email messages. </b><a class="indexterm" name="id-1.6.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.html"><b>Allow displaying HTML formatted emails. </b><a class="indexterm" name="id-1.6.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.6.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.6.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>
@@ -155,8 +153,8 @@
 <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.6.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.6.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.6.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>confirm recipients when replying to a mailing list. </b><a class="indexterm" name="id-1.6.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>Append vcard. </b><a class="indexterm" name="id-1.6.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.mailinglist"><b>Ask before replying to a mailing list. </b><a class="indexterm" name="id-1.6.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.6.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.6.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; ">
@@ -183,7 +181,10 @@
 <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>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
+</li>
 </ul>
 <p id="ox.appsuite.user.parent.email.settings">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.firststeps.changepassword.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.changepassword.html
index accc622a9..7ee69689b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.changepassword.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.changepassword.html
@@ -55,7 +55,7 @@
 <div class="task" id="ox.appsuite.user.task.firststeps.changepassword.widget">
 <p class="title">How to change your password in the <span class="guilabel"><strong>User data</strong></span> widget:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.changepassword.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. Click on <span class="phrase"><span class="guibutton"><strong>Portal</strong></span></span> in the App Launcher.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.changepassword.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> in the menu bar. Click on <span class="phrase"><span class="guibutton"><strong>Portal</strong></span></span> in the App Launcher.</p></li>
 <li class="step">
 <p role="presentation">If the <span class="guilabel"><strong>User data</strong></span> widget is not displayed, click on <span class="guibutton"><strong>Add widget</strong></span> on the upper right side. Click on <span class="guibutton"><strong>User data</strong></span>.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>My password</strong></span> in the <span class="guilabel"><strong>User data</strong></span> widget.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.applauncher.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.applauncher.html
index eeace0104..8552e532c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.applauncher.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.applauncher.html
@@ -37,7 +37,7 @@
 <p id="ox.appsuite.user.reference.firststeps.gui.applauncher">
         </p>
 <div class="informalfigure" id="ox.appsuite.user.fig.firststeps.gui.applauncher"><div class="screenshot"><div class="mediaobject"><img src="../../images/appsuite_user_gui_applauncher.png" alt="App Launcher"></div></div></div>
-<p>In order to show the app launcher, click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.applauncher.display"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> in the menu bar. </p>
+<p>In order to show the app launcher, click the  <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.applauncher.display"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. </p>
 <p class="title">Content</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Icons for launching the apps. Depending on the configuration, the number of icons can vary.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.foldertree.html
index b30e7482b..ed45da6e8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.foldertree.html
@@ -48,7 +48,7 @@
 <li class="listitem"><p role="presentation">In the <span class="phrase">Tasks</span> app, a folder is called list.</p></li>
 </ul>
 </li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Close folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.foldertree.close"><object type="image/svg+xml" data="../../images/layout-sidebar.svg" height="15"></object></span>  or <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.foldertree.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span>. If the folder view is closed, either no folders or only some folders will be displayed as icons, depending on the app.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Close folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.foldertree.close"><object type="image/svg+xml" data="../../images/layout-sidebar.svg" height="15"></object></span> or <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.foldertree.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span>. If the folder view is closed, either no folders or only some folders will be displayed as icons, depending on the app.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.firststeps.gui.foldertree"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.html
index dfe41fb1b..dd30d38e0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only">First Steps</h1>
 <div class="sect1" id="ox.appsuite.user.sect.firststeps.gui">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">General Description of the User Interface</h2></div></div></div>
-<a class="indexterm" name="id-1.3.7.2"></a><p id="ox.appsuite.user.orientation.firststeps.gui">Learn which general<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.elements">elements</a> the<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.gui">user interface</a> includes and where they are located.</p>
+<a class="indexterm" name="id-1.3.7.2"></a><p id="ox.appsuite.user.orientation.firststeps.gui">Learn which basic <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.elements">elements</a> are part of the <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.gui">user interface</a> and where they are located.</p>
 <p id="ox.appsuite.user.tip.firststeps.gui">Detailed descriptions of the app specific user interface elements can be found in the app specific topics. Links to the app specific topics can be found at the end of each following topic.</p>
 <p id="ox.appsuite.user.concept.firststeps.gui">The user interface includes the following elements: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.new.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.new.html
index dff714435..0a29aa341 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.new.html
@@ -37,7 +37,7 @@
 <p id="ox.appsuite.user.reference.firststeps.gui.new">
         </p>
 <div class="informalfigure" id="ox.appsuite.user.fig.firststeps.gui.new"><div class="screenshot"><div class="mediaobject"><img src="../../images/appsuite_user_gui_new.png" alt="The button for creating new objects"></div></div></div>
-<p>Creates app specific objects. The <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> opens a menu for creating objects for other apps. You can then e.g. enter a new appointment in the <span class="phrase">Email</span> app or enter a new contact without leaving the <span class="phrase">Email</span> app.</p>
+<p>Creates app specific objects. Depending on the app, the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> opens a menu for creating objects for other apps. You can then e.g. enter a new appointment in the <span class="phrase">Email</span> app or enter a new contact without leaving the <span class="phrase">Email</span> app.</p>
 <p id="ox.appsuite.user.hint.firststeps.gui.new.folderview">Note: If the folder is closed, the button will be displayed as icon. In this case, the <span class="guibutton"><strong>More actions</strong></span> icon will not be available. To show the folder view, click the <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.new.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> on the bottom left side.</p>
 <p id="ox.appsuite.user.related.firststeps.gui.new"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.notificationarea.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
index 2e21bc6e1..add3d63df 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.gui.notificationarea.html
@@ -64,7 +64,7 @@
 </li>
 <li class="listitem"><p role="presentation">In the basic settings, you can enable the option for displaying upcoming birthdays.</p></li>
 <li class="listitem"><p role="presentation">If clicking on a notification, a pop-up opens or closes. The pop-up shows the details for the event and provides editing functions.</p></li>
-<li class="listitem"><p role="presentation">The <span class="guibutton"><strong>Toggle category</strong></span> icons<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.notificationarea.categorie.close"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>allow you to hide or show single parts of the notification area.</p></li>
+<li class="listitem"><p role="presentation">With the <span class="guibutton"><strong>Toggle category</strong></span> icons <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.firststeps.gui.notificationarea.categorie.close"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> you can expand or collapse single parts of the notification area.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.firststeps.gui.notificationarea"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.html
index 42484cbd7..b1399e789 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.keyboard.html
@@ -34,9 +34,9 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Keyboard Input</h2></div></div></div>
 <a class="indexterm" name="id-1.3.8.2"></a><a class="indexterm" name="id-1.3.8.3"></a><p id="ox.appsuite.user.reference.firststeps.keyboard">Learn how to use key shortcuts for interacting with the groupware. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">list of defined  <a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.shortcuts.html"> keys and key combinations</a></p></li>
-<li class="listitem"><p role="presentation">Interact with the user interface  <a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.elements.html"> by using the keyboard</a></p></li>
-<li class="listitem"><p role="presentation"><a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.examples.html">examples</a> for using the keyboard input</p></li>
+<li class="listitem"><p role="presentation">list of defined <a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.shortcuts.html">keys and key combinations</a></p></li>
+<li class="listitem"><p role="presentation"><a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.elements.html">use the keyboard to interact</a> with the groupware</p></li>
+<li class="listitem"><p role="presentation"><a class="link" href="ox.appsuite.user.sect.firststeps.keyboard.examples.html">examples</a> for keyboard input</p></li>
 </ul>
 <p id="ox.appsuite.user.parent.firststeps.keyboard">Parent topic: <a class="xref" href="ox.appsuite.user.chap.firststeps.html"><i>First Steps</i></a></p>
 </div>
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 69aa7fdad..c3ac492a8 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
@@ -51,8 +51,8 @@
 </li>
 <li class="step"><p role="presentation">Click on <span class="phrase"><span class="guibutton"><strong>Guard</strong></span></span> in the left pane.</p></li>
 <li class="step">
-<p role="presentation">Activate <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
-<p role="presentation">If S/MIME encryption should be set as default, enable <span class="guibutton"><strong>Default to using S/MIME for signing and encryption</strong></span> below <span class="guibutton"><strong>Default settings</strong></span>.</p>
+<p role="presentation">Enable <span class="guibutton"><strong>Enable S/MIME</strong></span>.</p>
+<p role="presentation">If S/MIME encryption should be set as default, enable <span class="guibutton"><strong>Default to using S/MIME for signing and encryption</strong></span> below <span class="guibutton"><strong>Defaults</strong></span>.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.pgppublickeys.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
index e3a052717..ea4f00130 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.pgppublickeys.html
@@ -89,7 +89,7 @@
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.guard.keys.pgppublickeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p>
+<p id="ox.appsuite.user.parent.guard.keys.pgppublickeys">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.keys.html">key management</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
index e8453ccb7..9fea48568 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yourpgpkeys.html
@@ -71,7 +71,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guilabel"><strong>Keys</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens. Select <span class="guibutton"><strong>PGP</strong></span>.</p>
+<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Select <span class="guibutton"><strong>PGP</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Your Keys</strong></span> window opens.</p>
 <p role="presentation"><ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Your PGP keys will be displayed. Each PGP key consists of a master key and a subkey. <ul class="itemizedlist" style="list-style-type: circle; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
index 178db9f06..7796ec432 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.yoursmimekeys.html
@@ -67,7 +67,7 @@
 <p class="title">How to add a new S/MIME key:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guibutton"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guibutton"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to change</strong></span> window opens.</p>
 <p role="presentation">Select <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Your Certificates</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Add</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.keys.yoursmimekeys.addkey.add"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guilabel"><strong>Your Key List</strong></span>. The <span class="guilabel"><strong>Upload S/MIME Keys</strong></span> window opens.</p></li>
@@ -88,7 +88,7 @@
 <p class="title">How to display your own S/MIME keys or make a S/MIME key the current one:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guilabel"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Your keys</strong></span> below <span class="guilabel"><strong>Keys</strong></span>. The <span class="guilabel"><strong>Select type of keys to change</strong></span> window opens.</p>
 <p role="presentation">Select <span class="guibutton"><strong>S/MIME</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Your Certificates</strong></span> window opens. Your S/MIME keys will be displayed.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.password.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.password.html
index c5cee2600..ae56fb1a8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.password.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.password.html
@@ -42,8 +42,8 @@
 <li class="listitem cap-smime" id="id-1.13.12.7.1.5"><p role="presentation">Depending on the configuration, you can also use S/MIME for the encryption instead of PGP. In this case, separate passwords for PGP and S/MIME will be used.</p></li>
 </ul>
 <p> Note: Depending on the configuration, some of those functions might not be available.</p>
-<div class="task" id="ox.appsuite.user.task.guard.password">
-<p class="title">How to use the password management functions:</p>
+<div class="task help-hide-inline" id="ox.appsuite.user.task.guard.password">
+<p class="title">How to open the password management functions:</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.guard.password"><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>
@@ -62,7 +62,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Change password</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
+<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
 </li>
 <li class="step">
 <p role="presentation">In the <span class="phrase"><span class="guibutton"><strong>Enter current Guard security password</strong></span></span> field, enter the password that you have used so far for encrypting your data.</p>
@@ -77,7 +77,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Reset password</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
+<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Reset password</strong></span> window opens.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Reset</strong></span>.</p>
 </li>
 <li class="step">
@@ -92,7 +92,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Set email address for reset</strong></span>.</p>
-<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to list</strong></span> window opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Secondary Email Address</strong></span> window opens.</p>
+<p role="presentation" class="cap-smime">Depending on the configuration, the <span class="guilabel"><strong>Select type of keys to change</strong></span> opens. Depending on the encryption type you want to reset the password for, select <span class="guibutton"><strong>PGP</strong></span> or <span class="guibutton"><strong>S/MIME</strong></span>. The <span class="guilabel"><strong>Secondary Email Address</strong></span> window opens.</p>
 </li>
 <li class="step">
 <p role="presentation">In the <span class="phrase"><span class="guibutton"><strong>Enter current Guard security password</strong></span></span> field, enter the password that you have used so far for encrypting your data.</p>
@@ -122,7 +122,7 @@
 <p role="presentation" class="cap-smime"><a class="xref" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing public keys</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.guard.password">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p>
+<p id="ox.appsuite.user.parent.guard.password">Parent topic: <a class="xref" href="ox.appsuite.user.chap.guard.html"><i>Encrypting Data with <span class="phrase">Guard</span></i></a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.settings.html
index bc49a40ff..51372f623 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.settings.html
@@ -34,8 +34,8 @@
 <div class="sect1" id="ox.appsuite.user.sect.guard.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">
 <span class="phrase">Guard</span>Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.13.14.2"></a><a class="indexterm" name="id-1.13.14.3"></a><a class="indexterm" name="id-1.13.14.4"></a><div class="task" id="ox.appsuite.user.task.guard.settings">
-<p class="title">How to use the <span class="phrase">Guard</span> settings:</p>
+<a class="indexterm" name="id-1.13.14.2"></a><a class="indexterm" name="id-1.13.14.3"></a><a class="indexterm" name="id-1.13.14.4"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.guard.settings">
+<p class="title">How to open the <span class="phrase">Guard</span> settings:</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.guard.settings"><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>
@@ -53,10 +53,10 @@
 <h3 class="title">Default settings</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.encrypt"><b>Default to send encrypted when composing email. </b><a class="indexterm" name="id-1.13.14.7.2.1.1.1.2"></a>Defines whether a new email is encrypted by default.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Default adding signature to outgoing mails. </b><a class="indexterm" name="id-1.13.14.7.2.1.2.1.2"></a>Defines whether a new email is encrypted per default.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.guard.settings.default.sign"><b>Default adding signature to outgoing mails. </b><a class="indexterm" name="id-1.13.14.7.2.1.2.1.2"></a>Defines whether a new email is encrypted by default.</p></li>
 <li class="listitem cap-smime" id="id-1.13.14.7.2.1.3">
-<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>default to using S/MIME for signing and encryption. </b><a class="indexterm" name="id-1.13.14.7.2.1.3.1.2"></a></p>
-<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">If the <span class="guibutton"><strong>Enable S/MIME</strong></span> checkbox is enabled, S/MIME will be used for encryption by default.</p></li></ul>
+<p id="ox.appsuite.user.task.guard.settings.default.smime"><b>Default to using S/MIME for signing and encryption. </b><a class="indexterm" name="id-1.13.14.7.2.1.3.1.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p role="presentation">Defines whether S/MIME is used for signing and encryption by default.  </p></li></ul>
 </li>
 <li class="listitem">
 <p id="ox.appsuite.user.task.guard.settings.default.inline"><b>Default to using PGP inline for new mails. </b><a class="indexterm" name="id-1.13.14.7.2.1.4.1.2"></a>Note: This option is only available if the <span class="guibutton"><strong>Advanced settings</strong></span> checkbox is enabled. </p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.portal.customize.add.html b/help/l10n/en_US/ox.appsuite.user.sect.portal.customize.add.html
index 950c979ea..1f196cdb3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.portal.customize.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.portal.customize.add.html
@@ -40,7 +40,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <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">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.customize.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.customize.add.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Portal</strong></span> in the left pane. Click on <span class="guibutton"><strong>Add widget</strong></span>. Select an entry.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.portal.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.portal.settings.html
index 8ed9275e2..907f4c565 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.portal.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.portal.settings.html
@@ -32,11 +32,11 @@
   <h1 class="sr-only"><span class="phrase">Portal</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.portal.settings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Portal Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.5.8.2"></a><div class="task" id="ox.appsuite.user.task.portal.settings">
-<p class="title">How to use the Portal settings:</p>
+<a class="indexterm" name="id-1.5.8.2"></a><div class="task help-hide-inline" id="ox.appsuite.user.task.portal.settings">
+<p class="title">How to open the Portal settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.settings"><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>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
@@ -58,16 +58,14 @@
 <li class="listitem">
 <p id="ox.appsuite.user.reference.portal.settings.widgets.editdwidget"><b>Functions for editing widgets. </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.portal.settings.widgets.move"><b><span class="guibutton"><strong>Move</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.settings.move"><object type="image/svg+xml" data="../../images/grip-vertical.svg" height="15"></object></span>
-                      . </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.1.1.2"></a>Changes the widget order.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.portal.settings.widgets.move"><b><span class="guibutton"><strong>Move</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.portal.settings.move"><object type="image/svg+xml" data="../../images/grip-vertical.svg" height="15"></object></span>. </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.1.1.2"></a>Changes the widget order.</p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.portal.settings.widgets.edit"><b>Edit. </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.2.1.2"></a>Allows editing a widget's settings, e.g. the url or description.</p>
 <p role="presentation">Note: This button is only available for certain widgets.</p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.portal.settings.widgets.activate"><b>Disable. </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.3.1.2"></a><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.3.1.3"></a>Removes a widget from the Portal. To display the widget again, click on the <span class="guibutton"><strong>Enable</strong></span> button.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.portal.settings.widgets.remove"><b><span class="guibutton"><strong>Delete</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.remove"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>
-                      . </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.4.1.2"></a>This icon deletes a widget from the portal and from the list of widgets on the settings page.</p>
+<p id="ox.appsuite.user.reference.portal.settings.widgets.remove"><b><span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.remove"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>. </b><a class="indexterm" name="id-1.5.8.5.2.1.2.1.3.1.4.1.2"></a>This icon deletes a widget from the portal and from the list of widgets on the settings page.</p>
 <p role="presentation"><span class="phrase"><strong>Warning:</strong></span> If you delete a widget, all settings for this widget will be lost.</p>
 </li>
 </ul>
@@ -77,7 +75,7 @@
 <h3 class="title">Advanced settings</h3>
 <p><a class="indexterm" name="id-1.5.8.6.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
-<p id="ox.appsuite.user.reference.portal.settings.advanced.mobilesummary"><b>Reduce to widget summary. </b><a class="indexterm" name="id-1.5.8.6.3.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.portal.settings.advanced.mobilesummary"><b>Reduce to widget summary on smartphones. </b><a class="indexterm" name="id-1.5.8.6.3.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">Defines whether the complete content of a widget is displayed on mobile devices or just an overview. This is e.g. valid for the widgets <span class="guilabel"><strong>Recently changed files</strong></span>, <span class="guilabel"><strong>Appointments</strong></span>, <span class="guilabel"><strong>Inbox</strong></span>. In order to view the complete content of the widget, tap the overview text.</p>
 <p role="presentation">Note: You have to re-login in order for the new setting to get activated.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html b/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
index ea01a6bb9..83c20d5e5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.apppasswords.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.apppasswords">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Application Passwords</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.security.apppasswords">In addition to your groupware login method, you can use additional application passwords that are limited for certain apps and devices. This method has the following advantages: </p>
+<a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.orientation.security.apppasswords">In addition to your groupware login method, you can use additional application passwords that are limited for certain apps and devices. This method has the following advantages: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The clients can access specific groupware functions only. This enhances the security for the user.</p></li>
 <li class="listitem"><p role="presentation">In the groupware settings you can view the clients and devices you created passwords for.</p></li>
@@ -46,11 +46,13 @@
 <div class="task" id="ox.appsuite.user.task.security.apppasswords">
 <p class="title">How to use application passwords:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.security.apppasswords.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane. Click on <span class="guibutton"><strong>Application Passwords</strong></span>.</p>
-<p role="presentation">The <span class="guilabel"><strong>Application Passwords</strong></span> page will be displayed.</p>
+</li>
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Application Passwords</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">In the <span class="guibutton"><strong>Application</strong></span> drop-down below <span class="guibutton"><strong>Add passwords</strong></span>, select the app for which you want to add a password.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html b/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
index bf158410e..b7353e2db 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.autologout.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
-<link rel="prev" href="ox.appsuite.user.chap.security.html" title="Data Security">
-<link rel="next" href="ox.appsuite.user.sect.security.emaillinkedimages.html" title="Externally Linked Images in Emails">
+<link rel="prev" href="ox.appsuite.user.sect.security.emaillinkedimages.html" title="Externally Linked Images in Emails">
+<link rel="next" href="ox.appsuite.user.chap.guard.html" title="Encrypting Data with Guard">
 <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"> 
@@ -22,25 +22,28 @@
 <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.chap.security.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.emaillinkedimages.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.emaillinkedimages.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.chap.guard.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.autologout">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Signing out Automatically</h2></div></div></div>
-<a class="indexterm" name="id-1.12.5.2"></a><a class="indexterm" name="id-1.12.5.3"></a><p id="ox.appsuite.user.concept.security.autologout">You can define whether you are automatically signed out if you have not worked with the groupware for a specific time.</p>
+<a class="indexterm" name="id-1.12.9.2"></a><a class="indexterm" name="id-1.12.9.3"></a><p id="ox.appsuite.user.concept.security.autologout">You can define whether you are automatically signed out if you have not worked with the groupware for a specific time.</p>
 <div class="task" id="ox.appsuite.user.task.security.autologout">
 <p class="title">How to define whether you are automatically signed out:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.security.autologout.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane. Click on <span class="guibutton"><strong>Advanced Settings</strong></span> in the right pane.</p></li>
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Advanced Settings</strong></span> in the right pane.</p>
+</li>
 <li class="step"><p role="presentation">Select an entry from the <span class="guibutton"><strong>Automatic sign out</strong></span> drop-down.</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html b/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
index fa785d175..40433d155 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.emaillinkedimages.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
-<link rel="prev" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
-<link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Displaying or Signing Out from Active Clients">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Managing verification methods">
+<link rel="next" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,17 +22,17 @@
 <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.autologout.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.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>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.autologout.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.emaillinkedimages">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Externally Linked Images in Emails</h2></div></div></div>
-<a class="indexterm" name="id-1.12.6.2"></a><a class="indexterm" name="id-1.12.6.3"></a><p id="ox.appsuite.user.concept.security.emaillinkedimages">External images are not part of the email itself. They are loaded from an external source upon reading the email. You can define whether those images are loaded and displayed. If you allow loading externally linked images, your privacy and computer are endangered by the following security issues: </p>
+<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.concept.security.emaillinkedimages">External images are not part of the email itself. They are loaded from an external source upon reading the email. You can define whether those images are loaded and displayed. If you allow loading externally linked images, your privacy and computer are endangered by the following security issues: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The sender can gather information, e.g. whether your email address is valid or when you retrieved the email. Such information can e.g. be used to purposefully send spam emails.</p></li>
 <li class="listitem"><p role="presentation">The externally linked graphic can be used to infect your computer with malware.</p></li>
@@ -40,12 +40,15 @@
 <div class="task" id="ox.appsuite.user.task.security.emaillinkedimages">
 <p class="title">How to define the loading of externally linked images:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.security.emaillinkedimages.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p></li>
-<li class="step"><p role="presentation">Define the behavior below <span class="guibutton"><strong>External images in emails</strong></span>. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>External images in emails</strong></span> in the right pane.</p>
+</li>
+<li class="step"><p role="presentation">Define the behavior. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">If externally linked images are to be loaded and displayed, enable <span class="guibutton"><strong>Always show external images</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">If you always want to be asked whether externally linked images should be displayed, enable <span class="guibutton"><strong>Ask before showing external images</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">You can specify that externally linked images are always displayed if they come from specific senders. To do so, enter the email addresses of these senders in the input field below <span class="guibutton"><strong>Always show external images for the following senders</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
index d177d668e..4c969c6a1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.authenticator.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.security.multifactor.html" title="Multi-Factor Authentication">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Sett8ing up verification methods">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Setting up verification methods">
 <link rel="next" href="ox.appsuite.user.sect.security.multifactor.securitykey.html" title="Verifying the login with a security key">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.authenticator">
 <div class="titlepage"><div><div><h3 class="title">Verifying a login by using an authenticator app</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.8.2"></a><p id="ox.appsuite.user.concept.security.multifactor.authenticator">This verification method works as follows: </p>
+<a class="indexterm" name="id-1.12.7.8.2"></a><p id="ox.appsuite.user.concept.security.multifactor.authenticator">This verification method works as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Use a code that is created by an app on your mobile device.</p></li>
 <li class="listitem"><p role="presentation">The code is valid for 30 seconds. As soon as the time expires, a new code is automatically displayed which again is valid for 30 seconds.</p></li>
@@ -60,7 +60,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.authenticator">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
index 2412d4bc8..1cc9e045b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
 <link rel="prev" href="ox.appsuite.user.sect.security.apppasswords.html" title="Using Application Passwords">
-<link rel="next" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Sett8ing up verification methods">
+<link rel="next" href="ox.appsuite.user.sect.security.multifactor.settings.html" title="Setting up verification methods">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.multifactor">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Multi-Factor Authentication</h2></div></div></div>
-<a class="indexterm" name="id-1.12.9.2"></a><a class="indexterm" name="id-1.12.9.3"></a><p id="ox.appsuite.user.orientation.multifactor">Per default, you only log in to the groupware with your username and password. Depending on the configuration, you can increase the security when logging in by using an additional authentication that is executed after the usual login. This procedure is generally called multi-factor authentication.</p>
+<a class="indexterm" name="id-1.12.7.2"></a><a class="indexterm" name="id-1.12.7.3"></a><p id="ox.appsuite.user.orientation.multifactor">Per default, you only log in to the groupware with your username and password. Depending on the configuration, you can increase the security when logging in by using an additional authentication that is executed after the usual login. This procedure is generally called multi-factor authentication.</p>
 <p id="ox.appsuite.user.concept.security.multifactor">The additional authentication is done by verifying your identity with a device owned by you. You have the following options to verify your identity: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -50,11 +50,11 @@
 </ul>
 <p> The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering the verification</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.recovery.html">Recovering verifications</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.manage.html">Managing verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor">Parent topic: <a class="xref" href="ox.appsuite.user.chap.security.html"><i>Data Security</i></a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
index aa410dd57..f6b447111 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.manage.html
@@ -6,8 +6,8 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.security.multifactor.html" title="Multi-Factor Authentication">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.recovery.html" title="Recovering the verification">
-<link rel="next" href="ox.appsuite.user.chap.guard.html" title="Encrypting Data with Guard">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.recovery.html" title="Recovering verifications">
+<link rel="next" href="ox.appsuite.user.sect.security.emaillinkedimages.html" title="Externally Linked Images in 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.security.multifactor.recovery.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.chap.guard.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.manage">
 <div class="titlepage"><div><div><h3 class="title">Managing verification methods</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.12.2"></a><a class="indexterm" name="id-1.12.9.12.3"></a><p id="ox.appsuite.user.concept.security.multifactor.manage">The following options exist: </p>
+<a class="indexterm" name="id-1.12.7.12.2"></a><a class="indexterm" name="id-1.12.7.12.3"></a><p id="ox.appsuite.user.concept.security.multifactor.manage">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">add a verification method</p></li>
 <li class="listitem"><p role="presentation">change a verification device's name</p></li>
@@ -43,12 +43,12 @@
 <div class="task" id="ox.appsuite.user.task.security.multifactor.manage">
 <p class="title">How to manage verification methods or verification devices:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.security.multifactor.manage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>2-step verification</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">The following options exist: <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -60,7 +60,7 @@
 </div>
 <p id="ox.appsuite.user.related.security.multifactor.manage"></p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li></ul>
 <p id="ox.appsuite.user.parent.security.multifactor.manage">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
index 59efb390a..7588fd481 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.recovery.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Recovering the verification</title>
+<title>Recovering verifications</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,8 +32,8 @@
   <h1 class="sr-only">Data Security</h1>
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.recovery">
-<div class="titlepage"><div><div><h3 class="title">Recovering the verification</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.11.2"></a><p id="ox.appsuite.user.concept.security.multifactor.recovery">You need the recovery e.g. in case you have lost your device that you use for the verification. In this case, you can log in to the groupware by using the recovery method.</p>
+<div class="titlepage"><div><div><h3 class="title">Recovering verifications</h3></div></div></div>
+<a class="indexterm" name="id-1.12.7.11.2"></a><p id="ox.appsuite.user.concept.security.multifactor.recovery">You need the recovery e.g. in case you have lost your device that you use for the verification. In this case, you can log in to the groupware by using the recovery method.</p>
 <div class="task" id="ox.appsuite.user.task.security.multifactor.recovery">
 <p class="title">How to log in using a recovery method:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.recovery">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
index d22acca98..b452c671e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.securitykey.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.securitykey">
 <div class="titlepage"><div><div><h3 class="title">Verifying the login with a security key</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.9.2"></a><p id="ox.appsuite.user.concept.security.multifactor.securitykey">This verification method works as follows: </p>
+<a class="indexterm" name="id-1.12.7.9.2"></a><p id="ox.appsuite.user.concept.security.multifactor.securitykey">This verification method works as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Use a security key that you connect with your computer via USB or wirelessly.</p></li>
 <li class="listitem"><p role="presentation">While signing in, you are prompted to activate the security key e.g. by pressing a button on the security key.</p></li>
@@ -58,7 +58,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.sms.html">Verifying the login with an SMS code</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.securitykey">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
index cc8c860d2..1f0515bc1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.settings.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sett8ing up verification methods</title>
+<title>Setting up verification methods</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,8 +32,8 @@
   <h1 class="sr-only">Data Security</h1>
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.settings">
-<div class="titlepage"><div><div><h3 class="title">Sett8ing up verification methods</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.7.2"></a><a class="indexterm" name="id-1.12.9.7.3"></a><p id="ox.appsuite.user.concept.security.multifactor.settings">Prior to being able to use a 2-step verification for the next login, you have to set up the additional verification methods wanted. The following options exist: </p>
+<div class="titlepage"><div><div><h3 class="title">Setting up verification methods</h3></div></div></div>
+<a class="indexterm" name="id-1.12.7.7.2"></a><a class="indexterm" name="id-1.12.7.7.3"></a><p id="ox.appsuite.user.concept.security.multifactor.settings">Prior to being able to use a 2-step verification for the next login, you have to set up the additional verification methods wanted. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Set up verification methods</p></li>
 <li class="listitem">
@@ -44,10 +44,13 @@
 <div class="task" id="ox.appsuite.user.task.security.multifactor.settings">
 <p class="title">How to set up verification methods:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.security.multifactor.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane. Click on <span class="guibutton"><strong>2-step verification</strong></span>.</p>
+</li>
+<li class="step">
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>2-step verification</strong></span>.</p>
 </li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Add verification option</strong></span>.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
index d0426031d..420d10e8e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.multifactor.sms.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.security.multifactor.html" title="Multi-Factor Authentication">
 <link rel="prev" href="ox.appsuite.user.sect.security.multifactor.securitykey.html" title="Verifying the login with a security key">
-<link rel="next" href="ox.appsuite.user.sect.security.multifactor.recovery.html" title="Recovering the verification">
+<link rel="next" href="ox.appsuite.user.sect.security.multifactor.recovery.html" title="Recovering verifications">
 <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"> 
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Multi-Factor Authentication</h2>
 <div class="sect2" id="ox.appsuite.user.sect.security.multifactor.sms">
 <div class="titlepage"><div><div><h3 class="title">Verifying the login with an SMS code</h3></div></div></div>
-<a class="indexterm" name="id-1.12.9.10.2"></a><p id="ox.appsuite.user.concept.security.multifactor.sms">This verification method works as follows: </p>
+<a class="indexterm" name="id-1.12.7.10.2"></a><p id="ox.appsuite.user.concept.security.multifactor.sms">This verification method works as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Use a code that you receive per SMS on your mobile device.</p></li>
 <li class="listitem"><p role="presentation">The last digits of the mobile phone number of the device to which the SMS will be sent to, are displayed.</p></li>
@@ -56,7 +56,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.authenticator.html">Verifying a login by using an authenticator app</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.securitykey.html">Verifying the login with a security key</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Sett8ing up verification methods</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.security.multifactor.settings.html">Setting up verification methods</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.security.multifactor.sms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html b/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
index e3f756751..947646670 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.security.sessions.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.security.html" title="Data Security">
-<link rel="prev" href="ox.appsuite.user.sect.security.emaillinkedimages.html" title="Externally Linked Images in Emails">
+<link rel="prev" href="ox.appsuite.user.chap.security.html" title="Data Security">
 <link rel="next" href="ox.appsuite.user.sect.security.apppasswords.html" title="Using Application Passwords">
 <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.emaillinkedimages.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.chap.security.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.apppasswords.html">Next</a></li>
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Data Security</h1>
 <div class="sect1" id="ox.appsuite.user.sect.security.sessions">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Displaying or Signing Out from Active Clients</h2></div></div></div>
-<a class="indexterm" name="id-1.12.7.2"></a><a class="indexterm" name="id-1.12.7.3"></a><p id="ox.appsuite.user.orientation.security.sessions">You can be signed in to your groupware account with different clients on various devices simultaneously, e.g. with desktop browsers, email clients, tablets, smartphones. With each login, an active <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.session">session</a> is created on the groupware server. On the following occasions it can make sense to list active sessions and to terminate them if required: </p>
+<a class="indexterm" name="id-1.12.5.2"></a><a class="indexterm" name="id-1.12.5.3"></a><p id="ox.appsuite.user.orientation.security.sessions">You can be signed in to your groupware account with different clients on various devices simultaneously, e.g. with desktop browsers, email clients, tablets, smartphones. With each login, an active <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.session">session</a> is created on the groupware server. On the following occasions it can make sense to list active sessions and to terminate them if required: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You want to check whether you are logged in to a certain device or client.</p></li>
 <li class="listitem"><p role="presentation">You want to log our from a certain device.</p></li>
@@ -47,12 +47,13 @@
 <div class="task" id="ox.appsuite.user.task.security.sessions">
 <p class="title">How to edit the active clients:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<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.security.sessions.settings"><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>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane. Click on <span class="guibutton"><strong>Your devices</strong></span>.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Security</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Your devices</strong></span> in the right pane.</p>
 <p role="presentation">All devices will be listed which you are currently signed in with.</p>
 </li>
 <li class="step"><p role="presentation">In order to terminate sessions, do one of the following: <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.commonsettings.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.commonsettings.html
index a826af4aa..4951472f5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.commonsettings.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.commonsettings.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.settings.html" title="Customized Settings">
-<link rel="prev" href="ox.appsuite.user.chap.settings.html" title="Customized Settings">
+<link rel="prev" href="ox.appsuite.user.sect.settings.search.html" title="Searching for Settings">
 <link rel="next" href="ox.appsuite.user.sect.settings.notifications.html" title="Customizing the Notifications">
 <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.chap.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.settings.search.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.settings.notifications.html">Next</a></li>
@@ -32,20 +32,17 @@
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.commonsettings">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Adjusting the General Settings</h2></div></div></div>
-<a class="indexterm" name="id-1.4.5.2"></a><a class="indexterm" name="id-1.4.5.3"></a><p id="ox.appsuite.user.concept.settings.commonsettings">In the general settings, you can select the color for the user interface, language, regional settings and other personal settings.</p>
-<div class="task" id="ox.appsuite.user.task.settings.commonsettings">
-<p class="title">How to customize the general settings:</p>
+<a class="indexterm" name="id-1.4.6.2"></a><a class="indexterm" name="id-1.4.6.3"></a><p id="ox.appsuite.user.concept.settings.commonsettings">In the general settings, you can select the color for the user interface, language, regional settings and other personal settings.</p>
+<div class="task help-hide-inline" id="ox.appsuite.user.task.settings.commonsettings">
+<p class="title">How to open the general settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.commonsettings.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.commonsettings.settings"><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>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.settings.commonsettings">Depending on the configuration, the following settings are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -54,15 +51,16 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html#ox.appsuite.user.reference.settings.commonsettings.applauncher">Start app &amp; Quick launch bar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html#ox.appsuite.user.reference.settings.commonsettings.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.settings.commonsettings.theme"></p>
 <h3 class="title">Theme</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.theme.color"><b>Accent colors. </b><a class="indexterm" name="id-1.4.5.7.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.theme.color"><b>Accent colors. </b><a class="indexterm" name="id-1.4.6.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Defines the color for highlighted elements.</p></li></ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.theme.background"><b>backgrounds. </b><a class="indexterm" name="id-1.4.5.7.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.theme.background"><b>Backgrounds. </b><a class="indexterm" name="id-1.4.6.7.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Defines the user interface color.</p></li></ul>
 </li>
 </ul>
@@ -70,28 +68,28 @@
 <h3 class="title">Language and timezone</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.language"><b>Language. </b><a class="indexterm" name="id-1.4.5.8.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.language"><b>Language. </b><a class="indexterm" name="id-1.4.6.8.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation">Defines the user interface language.</p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"></p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.region"><b>customize date and time formats. </b><a class="indexterm" name="id-1.4.5.8.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.region"><b>Customize date and time formats. </b><a class="indexterm" name="id-1.4.6.8.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">Opens a window for customizing regional settings. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">time format</p></li>
-<li class="listitem"><p role="presentation">date format</p></li>
-<li class="listitem"><p role="presentation">number format</p></li>
-<li class="listitem"><p role="presentation">first weekday of a calendar week</p></li>
-<li class="listitem"><p role="presentation">first calendar week of a year</p></li>
+<li class="listitem"><p role="presentation">Time format</p></li>
+<li class="listitem"><p role="presentation">Date format</p></li>
+<li class="listitem"><p role="presentation">Number format</p></li>
+<li class="listitem"><p role="presentation">First day of the week</p></li>
+<li class="listitem"><p role="presentation">First week of the year</p></li>
 </ul>
 <p role="presentation"> The preset regional settings depend on the selected language.</p>
 </li></ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.timezone"><b>Timezone. </b><a class="indexterm" name="id-1.4.5.8.2.1.3.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.languagetimezone.timezone"><b>Timezone. </b><a class="indexterm" name="id-1.4.6.8.2.1.3.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation">Defines the time zone to which all time-bound entries refer.</p>
 <p role="presentation">Also see <a class="xref" href="ox.appsuite.user.sect.calendar.view.timezones.html">Displaying multiple time zones</a></p>
@@ -102,11 +100,11 @@
 <h3 class="title">Start app &amp; Quick launch bar</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.applauncher.defaultapp"><b>start with. </b><a class="indexterm" name="id-1.4.5.9.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.applauncher.defaultapp"><b>Start with. </b><a class="indexterm" name="id-1.4.6.9.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Defines the application that is displayed after login.</p></li></ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.applauncher.quicklaunch"><b>Configure quick launchers. </b><a class="indexterm" name="id-1.4.5.9.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.applauncher.quicklaunch"><b>Configure quick launch bar. </b><a class="indexterm" name="id-1.4.6.9.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Opens a window that enables you to define the apps that should be displayed as quick launch icons in the menu bar. Depending on the configuration, you can set a different number of quick launch icons. You can also open the window from a quick launch icon's context menu.</p></li></ul>
 </li>
 </ul>
@@ -114,16 +112,16 @@
 <h3 class="title">Advanced settings</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.settings.commonsettings.refresh"><b>look for new data every. </b><a class="indexterm" name="id-1.4.5.10.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.refresh"><b>Look for new data every. </b><a class="indexterm" name="id-1.4.6.10.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">Defines the interval for retrieving new objects from the server.</p></li></ul>
 </li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.4.5.10.2.1.2">
+<li class="listitem feat-io-ox-core-categories" id="id-1.4.6.10.2.1.2">
 <p id="ox.appsuite.user.reference..settings.commonsettings.advanced.categories"><b>Manage categories. </b></p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li></ul>
 </li>
-<li class="listitem cap-deputy" id="id-1.4.5.10.2.1.3">
-<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Manage deputies. </b></p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Manage deputies</a></p></li></ul>
+<li class="listitem cap-deputy" id="id-1.4.6.10.2.1.3">
+<p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>manage deputies. </b></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">manage deputies</a></p></li></ul>
 </li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.commonsettings.changepassword"><b>Change password. </b></p>
@@ -133,7 +131,11 @@
 <p id="ox.appsuite.user.related.settings.commonsettings"></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.settings.notifications.html">Customizing the Notifications</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p>
+</li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></p>
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.countdown.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.countdown.html
index a555019c1..4136c2a41 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.countdown.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.countdown.html
@@ -6,8 +6,8 @@
 <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.settings.html" title="Customized Settings">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Using the Notification Area">
-<link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Changing Personal Contact Data">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Customizing the Notifications">
+<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Using the Notification Area">
 <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"> 
@@ -22,10 +22,10 @@
 <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.settings.notificationarea.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.settings.notifications.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.settings.personaldata.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.settings.notificationarea.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -50,14 +50,17 @@
 <div class="task feat-io-ox-core-countdown" id="ox.appsuite.user.task.settings.countdown">
 <p class="title">How to enable the countdown window:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.countdowns"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<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.settings.countdowns"><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>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane.</p></li>
 <li class="step">
-<p role="presentation">Enable <span class="guibutton"><strong>Show countdown for upcoming appointments</strong></span> at the bottom of the window.</p>
+<p role="presentation" class="help-hide-inline">Click on <span class="guibutton"><strong>Notifications</strong></span> in the left pane.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the right pane.</p>
+</li>
+<li class="step">
+<p role="presentation">Enable <span class="guibutton"><strong>Show countdown for upcoming appointments</strong></span>.</p>
 <p role="presentation">You can also use the following settings: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Define whether the countdown should be applied to all appointments or to specific appointments only.</p></li>
 <li class="listitem"><p role="presentation">Define how many minutes before the appointment the countdown should start.</p></li>
@@ -67,7 +70,11 @@
 </div>
 <p id="ox.appsuite.user.related.settings.countdown"></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.settings.notifications.html">Customizing the Notifications</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.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></p>
+<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.settings.countdown">Parent topic: <a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.notificationarea.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.notificationarea.html
index ec757b054..d94641a88 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.notificationarea.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.notificationarea.html
@@ -6,8 +6,8 @@
 <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.settings.html" title="Customized Settings">
-<link rel="prev" href="ox.appsuite.user.sect.settings.notifications.html" title="Customizing the Notifications">
-<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for Appointments">
+<link rel="next" href="ox.appsuite.user.sect.settings.personaldata.html" title="Changing Personal Contact Data">
 <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"> 
@@ -22,17 +22,17 @@
 <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.settings.notifications.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.settings.countdown.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.settings.countdown.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.settings.personaldata.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notificationarea">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using the Notification Area</h2></div></div></div>
-<a class="indexterm" name="id-1.4.7.2"></a><a class="indexterm" name="id-1.4.7.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">You will be notified in the notification area for the following events: </p>
+<a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><p id="ox.appsuite.user.concept.settings.notificationarea">You will be notified in the notification area for the following events: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Reminders for upcoming appointments or tasks</p></li>
 <li class="listitem"><p role="presentation">Invitations for new appointments and tasks</p></li>
@@ -43,7 +43,7 @@
 <p class="title">How to use the notification area:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">To open the notification area, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.notificationarea.open"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span> in the menu bar.</p>
+<p role="presentation">To open the notification area, click the  <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.notificationarea.open"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span> in the menu bar.</p>
 <p role="presentation">If there are new notifications, the icon will be marked with a red dot.</p>
 </li>
 <li class="step">
@@ -70,7 +70,7 @@
 <li class="listitem"><p role="presentation">To edit the task, use the functions in the pop-up.</p></li>
 </ul></p>
 </li>
-<li class="step"><p role="presentation">To close the notification area, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.notificationarea.close"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span> in the menu bar.</p></li>
+<li class="step"><p role="presentation">To close the the notification area, click the  <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.notificationarea.close"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span> in the menu bar.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.settings.notificationarea"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.notifications.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.notifications.html
index 613bb74b8..2a0ffaa28 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.notifications.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.notifications.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.settings.html" title="Customized Settings">
 <link rel="prev" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Adjusting the General Settings">
-<link rel="next" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Using the Notification Area">
+<link rel="next" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for 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"> 
@@ -25,59 +25,57 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.settings.commonsettings.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.settings.notificationarea.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.settings.countdown.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.notifications">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Customizing the Notifications</h2></div></div></div>
-<a class="indexterm" name="id-1.4.6.2"></a><a class="indexterm" name="id-1.4.6.3"></a><p id="ox.appsuite.user.concept.settings.notifications">The notification settings allow you to specify which events you want to be notified about and in which way.</p>
-<div class="task" id="ox.appsuite.user.task.settings.notifications">
-<p class="title">How to customize the notification settings:</p>
+<a class="indexterm" name="id-1.4.7.2"></a><a class="indexterm" name="id-1.4.7.3"></a><p id="ox.appsuite.user.concept.settings.notifications">The notification settings allow you to specify which events you want to be notified about and in which way.</p>
+<div class="task help-hide-inline" id="ox.appsuite.user.task.settings.notifications">
+<p class="title">How to open the notification settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.commonsettings.notifications"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.commonsettings.notifications"><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>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Notifications</strong></span> in the left pane.</p></li>
 </ol></div>
-<div class="taskrelated">
-        <p>To search for a specific setting, use the <span class="guibutton"><strong>Search</strong></span> input field.</p>
-      </div>
 </div>
 <p id="ox.appsuite.user.reference.settings.notifications">Depending on the configuration, the following settings are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.desktopnotifications">Desktop notifications</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.notificationarea">notification area</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.email">Email</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.notificationarea">Notification area</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.email">email</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.calendar">Calendar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.tasks">Tasks</a></p></li>
-<li class="listitem feat-zoom" id="id-1.4.6.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.zoom">Zoom</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.4.6.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.jitsi">Jitsi</a></p></li>
+<li class="listitem feat-zoom" id="id-1.4.7.6.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.zoom">Zoom</a></p></li>
+<li class="listitem feat-jitsi" id="id-1.4.7.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.jitsi">Jitsi</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.settings.notifications.desktopnotifications"></p>
 <h3 class="title">Desktop notifications</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>show desktop notifications. </b><a class="indexterm" name="id-1.4.6.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.6.7.2.1.1.1.3"></a>Defines whether you will receive a desktop notification about incoming emails if the groupware is in the background.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.desktopnotifications.show"><b>show desktop notifications. </b><a class="indexterm" name="id-1.4.7.7.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.7.2.1.1.1.3"></a>Defines whether you will receive a desktop notification about incoming emails if the groupware is in the background.</p></li>
 <li class="listitem">
 <p role="presentation">Depending on the browser settings, the <span class="guibutton"><strong>Manage browser permissions now</strong></span> button is displayed. Click the button. You are asked by the browser whether the receipt of notifications should be allowed. Grant this permission.</p>
 <p role="presentation">Note: Depending on the browser, you might have to allow the receipt of notifications in the browser settings for the setting above to take effect. Information can be found in the browser help pages.</p>
 </li>
 </ul>
 <p id="ox.appsuite.user.reference.settings.notifications.notificationarea"></p>
-<h3 class="title">notification area</h3>
+<h3 class="title">Notification area</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Automatically open the notification area when there are new reminders. </b><a class="indexterm" name="id-1.4.6.8.2.1.1.1.2"></a>Defines whether the notification area automatically opens when receiving a reminder for an appointment or a task.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>show birthdays in notification area. </b>Defines whether the notification area also includes upcoming birthdays.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.show"><b>Automatically open the notification area when there are new reminders. </b><a class="indexterm" name="id-1.4.7.8.2.1.1.1.2"></a>Defines whether the notification area automatically opens when receiving a reminder for an appointment or a task.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.birthdays"><b>Show birthdays in notification area. </b>Defines whether the notification area also includes upcoming birthdays.</p></li>
 </ul>
 <p> See <a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a></p>
 <p id="ox.appsuite.user.reference.settings.notifications.email"></p>
-<h3 class="title">Email</h3>
+<h3 class="title">email</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.notificationsounds.playsound"><b>Play sound on incoming mail. </b><a class="indexterm" name="id-1.4.6.9.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.6.9.2.1.1.1.3"></a>Defines whether a sound is played for incoming messages if the groupware is in the background.</p>
+<p id="ox.appsuite.user.reference.email.settings.notificationsounds.playsound"><b>Play sound on incoming mail. </b><a class="indexterm" name="id-1.4.7.9.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.9.2.1.1.1.3"></a>Defines whether a sound is played for incoming messages if the groupware is in the background.</p>
 <p role="presentation">Note: Desktop notifications have to be allowed in the browser settings. See <a class="xref" href="ox.appsuite.user.sect.settings.notifications.html#ox.appsuite.user.reference.settings.notifications.desktopnotifications">Desktop notifications</a></p>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.notificationsounds.sound"><b>Sound. </b>You can select between different sounds.</p></li>
@@ -85,14 +83,14 @@
 <p id="ox.appsuite.user.reference.settings.notifications.calendar"></p>
 <h3 class="title">Calendar</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem feat-io-ox-core-countdown" id="id-1.4.6.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Countdown. </b><a class="indexterm" name="id-1.4.6.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.6.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.6.10.2.1.1.1.4"></a> Defines whether a countdown window will be displayed for upcoming appointments. See <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p></li>
+<li class="listitem feat-io-ox-core-countdown" id="id-1.4.7.10.2.1.1"><p id="ox.appsuite.user.reference.settings.notifications.calendar.countdown"><b>Countdown. </b><a class="indexterm" name="id-1.4.7.10.2.1.1.1.2"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.3"></a><a class="indexterm" name="id-1.4.7.10.2.1.1.1.4"></a> Defines whether a countdown window will be displayed for upcoming appointments. See <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p></li>
 <li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.calendar.email"><b>Email notifications. </b>Specifies whether you will receive an email notification, if the following is true: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.changes"><b>Receive notifications when an appointment in which you participate is created, modified or deleted. </b><a class="indexterm" name="id-1.4.6.10.2.1.2.1.2.1.1.1.2"></a>An appointment in which you participate has been re-created, changed or deleted.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>receive notification as appointment creator when participants accept or decline. </b><a class="indexterm" name="id-1.4.6.10.2.1.2.1.2.1.2.1.2"></a>A participant accepted or declined an appointment created by you.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>receive notification as appointment participant when other participants accept or decline. </b><a class="indexterm" name="id-1.4.6.10.2.1.2.1.2.1.3.1.2"></a>a participant accepted or declined an appointment in which you participate.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>automatically delete the invitation email after the appointment has been accepted or declined. </b><a class="indexterm" name="id-1.4.6.10.2.1.2.1.2.1.4.1.2"></a>Defines whether the email notification for an appointment invitation will be automatically deleted when accepting or declining the appointment. 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.settings.notifications.calendar.email.changes"><b>Receive notifications when an appointment in which you participate is created, modified or deleted. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.1.1.2"></a>An appointment in which you participate has been re-created, changed or deleted.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.creator"><b>receive notification as appointment creator when participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.2.1.2"></a>A participant accepted or declined an appointment created by you.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>receive notification as appointment participant when other participants accept or decline. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.3.1.2"></a>a participant accepted or declined an appointment in which you participate.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.delete"><b>automatically delete the invitation email after the appointment has been accepted or declined. </b><a class="indexterm" name="id-1.4.7.10.2.1.2.1.2.1.4.1.2"></a>Defines whether the email notification for an appointment invitation will be automatically deleted when accepting or declining the appointment. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 </ul>
 </li>
 </ul>
@@ -101,9 +99,9 @@
 <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <p id="ox.appsuite.user.reference.settings.notifications.tasks.email"><b>Email notifications. </b>Specifies whether you will receive an email notification, if the following is true: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.new"><b>Receive notifications when a task in which you participate is created, modified or deleted. </b><a class="indexterm" name="id-1.4.6.11.2.1.1.1.2.1.1.1.2"></a>A task in which you participate has been re-created, changed or deleted.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.creator"><b>Receive notifications when a participant accepted or declined a task created by you. </b><a class="indexterm" name="id-1.4.6.11.2.1.1.1.2.1.2.1.2"></a>A participant accepted or declined a task created by you.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.participant"><b>Receive notifications when a participant accepted or declined a task in which you participate. </b><a class="indexterm" name="id-1.4.6.11.2.1.1.1.2.1.3.1.2"></a>A participant accepted or declined a task in which you participate.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.new"><b>Receive notifications when a task in which you participate is created, modified or deleted. </b><a class="indexterm" name="id-1.4.7.11.2.1.1.1.2.1.1.1.2"></a>A task in which you participate has been re-created, changed or deleted.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.creator"><b>Receive notifications when a participant accepted or declined a task created by you. </b><a class="indexterm" name="id-1.4.7.11.2.1.1.1.2.1.2.1.2"></a>A participant accepted or declined a task created by you.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.participant"><b>Receive notifications when a participant accepted or declined a task in which you participate. </b><a class="indexterm" name="id-1.4.7.11.2.1.1.1.2.1.3.1.2"></a>A participant accepted or declined a task in which you participate.</p></li>
 </ul>
 </li></ul>
 <div id="ox.appsuite.user.reference.settings.notifications.zoom" class="feat-zoom">
@@ -121,7 +119,11 @@
 <p id="ox.appsuite.user.related.settings.notifications"></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.settings.commonsettings.html">Adjusting the General Settings</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns for Appointments</a></p>
+<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"><a class="xref" href="ox.appsuite.user.sect.settings.notificationarea.html">Using the Notification Area</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.notifications">Parent topic: <a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.personaldata.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.personaldata.html
index 31f1d13f4..3159ad680 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.personaldata.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.personaldata.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.settings.html" title="Customized Settings">
-<link rel="prev" href="ox.appsuite.user.sect.settings.countdown.html" title="Using Countdowns for Appointments">
+<link rel="prev" href="ox.appsuite.user.sect.settings.notificationarea.html" title="Using the Notification Area">
 <link rel="next" href="ox.appsuite.user.sect.settings.wizard.html" title="Using a Wizard to Set Up Local Apps">
 <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.settings.countdown.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.settings.notificationarea.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.settings.wizard.html">Next</a></li>
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.personaldata">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Changing Personal Contact Data</h2></div></div></div>
-<a class="indexterm" name="id-1.4.9.2"></a><a class="indexterm" name="id-1.4.9.3"></a><a class="indexterm" name="id-1.4.9.4"></a><a class="indexterm" name="id-1.4.9.5"></a><p id="ox.appsuite.user.hint.settings.personaldata">Note: Depending on the configuration, this function might not be available.</p>
+<a class="indexterm" name="id-1.4.10.2"></a><a class="indexterm" name="id-1.4.10.3"></a><a class="indexterm" name="id-1.4.10.4"></a><a class="indexterm" name="id-1.4.10.5"></a><p id="ox.appsuite.user.hint.settings.personaldata">Note: Depending on the configuration, this function might not be available.</p>
 <p id="ox.appsuite.user.concept.settings.personaldata">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">change personal contact data</p></li>
@@ -53,7 +53,7 @@
 <p class="title">How to create a contact picture:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>My account</strong></span> icon in the menu bar. Click on <span class="guibutton"><strong>Edit personal data</strong></span>.</p></li>
-<li class="step"><p role="presentation">Click on the empty contact picture. The <span class="guilabel"><strong>Edit image</strong></span> window opens. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step"><p role="presentation">Click on the empty contact picture. The <span class="guilabel"><strong>Change contact picture</strong></span> window opens. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can upload an existing image or take a new picture with the device camera.</p></li>
 <li class="listitem"><p role="presentation">You can adjust the image section with the zoom and by moving or rotating the photo.</p></li>
 </ul></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.presencestatus.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.presencestatus.html
index 545d42985..9547e58b2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.presencestatus.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.presencestatus.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.presencestatus">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Setting the Presence Status</h2></div></div></div>
-<a class="indexterm" name="id-1.4.11.2"></a><a class="indexterm" name="id-1.4.11.3"></a><p id="ox.appsuite.user.concept.settings.presencestatus">You can set your current presence status to indicate your availability for a call to other users.</p>
+<a class="indexterm" name="id-1.4.12.2"></a><a class="indexterm" name="id-1.4.12.3"></a><p id="ox.appsuite.user.concept.settings.presencestatus">You can set your current presence status to indicate your availability for a call to other users.</p>
 <div class="task" id="ox.appsuite.user.task.settings.presencestatus">
 <p class="title">How to set the current presence status:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.search.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.search.html
new file mode 100644
index 000000000..f5521e983
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.search.html
@@ -0,0 +1,74 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Searching for Settings</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.settings.html" title="Customized Settings">
+<link rel="prev" href="ox.appsuite.user.chap.settings.html" title="Customized Settings">
+<link rel="next" href="ox.appsuite.user.sect.settings.commonsettings.html" title="Adjusting the General Settings">
+<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.chap.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.settings.commonsettings.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Customized Settings</h1>
+<div class="sect1" id="ox.appsuite.user.sect.settings.search">
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Searching for Settings</h2></div></div></div>
+<a class="indexterm" name="id-1.4.5.2"></a><a class="indexterm" name="id-1.4.5.3"></a><p id="ox.appsuite.user.concept.settings.search">You can search for a specific setting using a search term. All settings are searched in the process.</p>
+<div class="task" id="ox.appsuite.user.task.settings.search">
+<p class="title">How to search for a setting:</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.settings.search.settings"><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>
+<p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
+<p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+</li>
+<li class="step">
+<p role="presentation">Enter a search term in <span class="guibutton"><strong>Search</strong></span>.</p>
+<p role="presentation">If settings matching the search term are found, the results will be displayed in the left pane. </p>
+</li>
+<li class="step">
+<p role="presentation">Click on a result in the left pane.</p>
+<p role="presentation">The page with the setting will be displayed. The respective setting will be highlighted.</p>
+</li>
+<li class="step"><p role="presentation">In order to hide the search results, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.search.cancel"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the search term.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.settings.search"></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.settings.commonsettings.html">Adjusting the General Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Using Countdowns 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.settings.html">Email Settings</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span>Settings</a></p>
+</li>
+</ul>
+<p id="ox.appsuite.user.parent.settings.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.settings.html"><i>Customized Settings</i></a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.settings.wizard.html b/help/l10n/en_US/ox.appsuite.user.sect.settings.wizard.html
index 09efdb89d..d2069a132 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.wizard.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.wizard.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only">Customized Settings</h1>
 <div class="sect1" id="ox.appsuite.user.sect.settings.wizard">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using a Wizard to Set Up Local Apps</h2></div></div></div>
-<a class="indexterm" name="id-1.4.10.2"></a><a class="indexterm" name="id-1.4.10.3"></a><p id="ox.appsuite.user.concept.settings.wizard">You can also access your emails or groupware data by using suitable apps and clients on mobile devices or computers. You can use a wizard in the groupware to install and configure those apps and clients. The wizard includes the following functions: </p>
+<a class="indexterm" name="id-1.4.11.2"></a><a class="indexterm" name="id-1.4.11.3"></a><p id="ox.appsuite.user.concept.settings.wizard">You can also access your emails or groupware data by using suitable apps and clients on mobile devices or computers. You can use a wizard in the groupware to install and configure those apps and clients. The wizard includes the following functions: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Installing and configuring apps and clients on devices such as computers, tablets and smartphones. The supported devices are: Windows, Apple and Android.</p></li>
 <li class="listitem"><p role="presentation">Installing the local <span class="phrase">Drive</span> app for computers and mobile devices. This app is downloaded and installed from respective the app store for the device. The local Drive apps synchronize your <span class="phrase">Drive</span> app data with your computer or mobile device.</p></li>
@@ -41,7 +41,7 @@
 <div class="task" id="ox.appsuite.user.task.settings.wizard.use">
 <p class="title">How to use the wizard:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.settings.wizard.use"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Connect your device</strong></span>. The wizard will be launched.</p></li>
+<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.settings.wizard.use"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Connect your device</strong></span>. The wizard will be launched.</p></li>
 <li class="step"><p role="presentation">Select your system and the required devices. Follow the instructions.</p></li>
 </ol></div>
 </div>
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 cf69f4688..b01a8eaf2 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 287c668e7..394d05825 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,13 +1,13 @@
 <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">
 <link rel="up" href="ox.appsuite.user.chap.tasks.html" title="Tasks">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.call.html" title="Calling Task Participants">
-<link rel="next" href="ox.appsuite.user.sect.tasks.folder.personal.html" title="Adding personal task list">
+<link rel="next" href="ox.appsuite.user.sect.tasks.folder.personal.html" title="add personal task list">
 <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,12 +31,12 @@
 <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.9.14.2"></a><a class="indexterm" name="id-1.9.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; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">Adding personal task list</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribe to public and shared task lists</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.personal.html">add personal task list</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.tasks.folder"></p>
 <p class="title">User interface:</p>
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 95e6e2d32..40fc41f3e 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
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Adding personal task list</title>
+<title>add personal task list</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.folder.html" title="Adding Task Lists">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.folder.html" title="Adding Task Lists">
-<link rel="next" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html" title="Subscribe to public and shared 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="subscribe 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"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,11 +30,11 @@
 </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>
+<div class="titlepage"><div><div><h3 class="title">add personal task list</h3></div></div></div>
 <a class="indexterm" name="id-1.9.14.8.2"></a><a class="indexterm" name="id-1.9.14.8.3"></a><p id="ox.appsuite.user.concept.tasks.folder.personal">You can create additional personal task lists below My lists.</p>
-<div class="task" id="ox.appsuite.user.task.tasks.folder">
+<div class="task help-hide-inline" id="ox.appsuite.user.task.tasks.folder">
 <p class="title">How to create a new personal task list:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.folder.personal.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to the <span class="guibutton"><strong>My lists</strong></span> folder in the folder view. Click on <span class="guibutton"><strong>Add new task list</strong></span>.</p></li>
@@ -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 b93c2e1c3..e3b22252e 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
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Subscribe to public and shared task lists</title>
+<title>subscribe to public and shared 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">
-<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.personal.html" title="Adding personal task list">
+<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="add 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">
       <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">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">Subscribe to public and shared task lists</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">subscribe to public and shared task lists</h3></div></div></div>
 <a class="indexterm" name="id-1.9.14.9.2"></a><a class="indexterm" name="id-1.9.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>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
@@ -45,7 +45,7 @@
 <div class="task" id="ox.appsuite.user.task.tasks.folder.subscribeshared">
 <p class="title">How to define the task lists to be subscribed to and synchronized:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step">
+<li class="step help-hide-inline">
 <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.tasks.folder.subscribeshared.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New task</strong></span>. Click on <span class="guibutton"><strong>Subscribe shared task folders</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">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.folder.subscribeshared.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Subscribe shared task folders</strong></span>.</p></li>
@@ -56,8 +56,8 @@
 <li class="step">
 <p role="presentation">If you want a task list to be displayed, enable the <span class="guibutton"><strong>Subscribe to task list</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.folder.subscribeshared.off"><object type="image/svg+xml" data="../../images/toggle-off.svg" height="15"></object></span>.</p>
 <p role="presentation">If you want a displayed task list to be  synchronized, enable the <span class="guibutton"><strong>Synchronize via DAV</strong></span> checkbox.</p>
-<p role="presentation">If you no longer want a task list to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to task list</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span></p>
 </li>
+<li class="step"><p role="presentation">If you no longer want a task list to be displayed and synchronized, disable the <span class="guibutton"><strong>Subscribe to task list</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.folder.subscribeshared.on"><object type="image/svg+xml" data="../../images/toggle-on.svg" height="15"></object></span></p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.tasks.folder.subscribeshared"></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.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.foldertree.html
index 76df87c4e..9228f31d1 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.gui.new.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.new.html
index 53081f788..2f0447aa9 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.new.html
@@ -46,7 +46,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.add.create.html">Creating new tasks</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribe to public and shared task lists</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.gui.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
index a137178ac..f4531733a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.gui.settingsmenu.html
@@ -48,7 +48,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.gui.list.html">The <span class="phrase">Tasks</span> list view</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribe to public and shared task lists</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.gui.settingsmenu">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.gui.html">The <span class="phrase">Tasks</span> Components</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.invitation.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.invitation.html
index d6b8c26e0..ad67b8333 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.invitation.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.invitation.html
@@ -35,14 +35,14 @@
 <a class="indexterm" name="id-1.9.11.2"></a><p id="ox.appsuite.user.orientation.tasks.invitation">Learn how to reply to an appointment invitation if you are being added to a task.</p>
 <p id="ox.appsuite.user.concept.tasks.invitation">You will receive one of the following notifications: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">You will be informed about this task in the notification area.</p></li>
+<li class="listitem"><p role="presentation">You will be informed about this task in the Notification area.</p></li>
 <li class="listitem"><p role="presentation">You will receive an email invitation for the task.</p></li>
 </ul>
 <p> You can respond to the invitation with <span class="guibutton"><strong>Confirm</strong></span>, <span class="guibutton"><strong>Maybe</strong></span> or <span class="guibutton"><strong>Decline</strong></span>. You can always change the status later.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.invitation.unreadbadge">
-<p class="title">How to answer an task invitation in the notification area:</p>
+<p class="title">How to respond to a task invitation in the notification area:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.invitation.unreadbadge"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The notification area opens. Task invitations will be displayed below <span class="guibutton"><strong>Invitations</strong></span>.</p></li>
+<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Notifications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.invitation.unreadbadge"><object type="image/svg+xml" data="../../images/bell.svg" height="15"></object></span>. The info area opens. Task invitations will be displayed below <span class="guibutton"><strong>Invitations</strong></span>.</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">To reply to the task invitation without a comment, click on one of the buttons <span class="guibutton"><strong>Accept</strong></span>, <span class="guibutton"><strong>Maybe</strong></span>, <span class="guibutton"><strong>Decline</strong></span>.</p></li>
 <li class="listitem">
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 41fc9b23f..bc2135fb5 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
@@ -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.tasks.html" title="Tasks">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html" title="Subscribe to public and shared task lists">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html" title="subscribe to public and shared task lists">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marking tasks as done">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -45,7 +45,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.move.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html
index 90f48e788..fa7912af0 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
@@ -49,7 +49,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.gui.toolbar.html">The <span class="phrase">Tasks</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.tasks.folder.personal.html">Adding personal task list</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.personal.html">add personal task list</a></p></li></ul>
 <p id="ox.appsuite.user.parent.tasks.manage.move">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>
           </div>
-- 
GitLab