diff --git a/help/l10n/en_US/bk01-toc.html b/help/l10n/en_US/bk01-toc.html
index 53755676b70a4257fbb413dbe74dc0f67395d113..8a316d96b2225fa39903787f80f477f0b84cb1b6 100644
--- a/help/l10n/en_US/bk01-toc.html
+++ b/help/l10n/en_US/bk01-toc.html
@@ -165,7 +165,7 @@
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></li>
-<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></li>
@@ -268,7 +268,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite time zones</a></li>
-<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></li>
@@ -351,7 +351,7 @@
 <a href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></li>
-<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></li>
 <li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></li>
@@ -400,7 +400,7 @@
 <a href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a><ul>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></li>
-<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></li>
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></li>
@@ -468,7 +468,7 @@
 </ul>
 </li>
 <li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></li>
-<li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a></li>
+<li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span>Settings</a></li>
 </ul>
 </li>
 <li class="chapter">
@@ -512,7 +512,12 @@
 <li class="sect2"><a href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Viewing, editing, deleting accounts</a></li>
 </ul>
 </li>
-<li class="sect1 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></li>
+<li class="sect1 feat-io-ox-core-categories">
+<a href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a><ul>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></li>
+<li class="sect2 feat-io-ox-core-categories"><a href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></li>
+</ul>
+</li>
 <li class="sect1 cap-dataexport"><a href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></li>
 </ul>
 </li>
@@ -584,7 +589,7 @@
 <li class="sect2 cap-guard"><a href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Managing S/MIME keys of recipients</a></li>
 </ul>
 </li>
-<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></li>
+<li class="sect1 cap-guard"><a href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></li>
 </ul>
 </li>
 <li class="index"><a href="ox.appsuite.user.index.html">Index</a></li>
diff --git a/help/l10n/en_US/index.html b/help/l10n/en_US/index.html
index b849c29fa283576bff43f6798d1ab41b15a3fab8..39342d933d77f0c9837e3d5852477aaa9c14ef93 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 ©  Open-Xchange GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Legal Notice</a></div>
-<div><p class="pubdate">Thursday, March 07, 2024 Version 8.23.0 </p></div>
+<div><p class="pubdate">Friday, April 05, 2024 Version 8.24.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -174,7 +174,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a></p></li>
 <li class="listitem cap-webdav" id="id-1.1.6.2.2.1.10.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.webdav.html">Accessing Files with WebDAV</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></p></li>
-<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a></p></li>
+<li class="listitem cap-infostore" id="id-1.1.6.2.2.1.10.1.14"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span>Settings</a></p></li>
 </ul>
 </li>
 <li class="listitem" id="ox.appsuite.user.startpage.toc.dataorganisation" style="list-style-type: none">
@@ -184,7 +184,7 @@
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.1.6.2.2.1.11.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
 <li class="listitem cap-deputy" id="id-1.1.6.2.2.1.11.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.1.6.2.2.1.11.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.1.6.2.2.1.11.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 </li>
@@ -209,7 +209,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Signing Out from <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 </li>
 </ul>
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 2ece413d85f81fb31e70e562b72b88c8a2dcadfe..d98569d1d8adb35289e7eedbbc865115b6a70e4e 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
@@ -51,7 +51,6 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.delete.html">Deleting Contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a></p></li>
 </ul>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
index 2631d4dd15f66cef37d8796be8583d1db5bc932a..fd9b948768f38d87266bbf588054096fcdbbb626 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
@@ -37,7 +37,7 @@
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.12.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.12.2.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.12.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 feat-io-ox-core-categories" id="id-1.12.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p></li>
 <li class="listitem cap-dataexport" id="id-1.12.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p role="presentation" class="cap-guard">Information on encrypting emails and files 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>
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 e314a18113ca7fb93b8258b7ebd38a2541543e9d..220500fefe7a7b48ce6c4b282b7821bc60de7c95 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.drive.html
@@ -54,7 +54,7 @@
 <li class="listitem cap-share_links cap-share_mail_attachments" id="id-1.11.6.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
 <li class="listitem cap-webdav" id="id-1.11.6.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.webdav.html">Accessing Files with WebDAV</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span> Settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span>Settings</a></p></li>
 </ul>
 <p> Information on the usage of local apps on computers and mobile devices can be found in the <span class="phrase">Drive</span> apps user guide.</p>
 </div>
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 5217ad3c1a782e9c368e2d043d08a86867ead79e..b98998f8098ef35cb05167a47819dea1c2cd0c33 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.guard.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.logout.html">Signing Out from <span class="phrase">Guard</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.password.html">Password Management</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.keys.html">Key Management</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.guard">Information on further security-related topics can be found in <a class="xref" href="ox.appsuite.user.chap.security.html"><i>Data Security</i></a>.</p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.security.html b/help/l10n/en_US/ox.appsuite.user.chap.security.html
index 77d0a012eaf291712930249fccb2523554200ff2..f7be9bd544099800bb288abd469ac89ed1f14bd2 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html" title="Browsing categories">
 <link rel="next" href="ox.appsuite.user.sect.security.sessions.html" title="Displaying or Signing Out from Active Clients">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.sessions.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.settings.html b/help/l10n/en_US/ox.appsuite.user.chap.settings.html
index 9d100eb71ee9bb9ab5e8d11913e2a86eca8e38b6..b0a7aee79d705c6ec28aa18e4215332835fe937f 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.settings.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.settings.html
@@ -48,7 +48,7 @@
 <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>
+<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>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.index.html b/help/l10n/en_US/ox.appsuite.user.index.html
index c6f50d885f222ea601fc86c3028403664f9a5873..fbb19d4fa0ae6a7a69ed083cfaeed2f079bb5b1a 100644
--- a/help/l10n/en_US/ox.appsuite.user.index.html
+++ b/help/l10n/en_US/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="prev" href="ox.appsuite.user.sect.guard.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"> 
@@ -218,6 +218,8 @@
 </dt>
 <dt class="cap-calendar">move to another calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a>
 </dt>
+<dt class="feat-io-ox-core-categories">organize with categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a>
+</dt>
 <dt class="cap-calendar">print, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a>
 </dt>
 <dt class="cap-calendar">reschedule to another day, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
@@ -240,8 +242,6 @@
 </dt>
 <dt class="cap-calendar">use calendar colors, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
-</dt>
 <dt class="">use countdown, <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-calendar">use the date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.datepicker.html">Using the date picker</a>
@@ -268,8 +268,12 @@
 </div>
 <div class="indexdiv">
 <h3>B</h3>
-<dl><dt class="">button for creating new objects, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.new.html">The button for creating new objects</a>
-</dt></dl>
+<dl>
+<dt class="feat-io-ox-core-categories">Browse categories, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a>
+</dt>
+<dt class="">button for creating new objects, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.new.html">The button for creating new objects</a>
+</dt>
+</dl>
 </div>
 <div class="indexdiv">
 <h3>C</h3>
@@ -303,6 +307,8 @@
 </dt>
 <dt class="cap-calendar">New appointment button, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">The New appointment button</a>
 </dt>
+<dt class="feat-io-ox-core-categories">organize appointments with categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a>
+</dt>
 <dt class="cap-calendar">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.popup.html">The Calendar pop-up</a>
 </dt>
 <dt class="cap-calendar">scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.scheduling.html">The scheduling view</a>
@@ -323,8 +329,6 @@
 </dt>
 <dt class="cap-calendar">use calendar colors, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
-</dt>
 <dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
 </dt>
 <dt class="cap-calendar">use the scheduling view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a>
@@ -334,6 +338,8 @@
 <dd><dl>
 <dt class="cap-portal">advanced settings, <a class="indexterm" href="ox.appsuite.user.sect.portal.settings.html">Portal Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>, <a class="indexterm" href="ox.appsuite.user.sect.contacts.settings.html">Address Book Settings</a>
 </dt>
+<dt class="">appointment invitations, changes or deletions, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+</dt>
 <dt class="cap-calendar">appointment reminders, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">automatically apply appointment changes received via email to your calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
@@ -344,23 +350,21 @@
 </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>
 <dt class="cap-calendar">Jitsi meetings, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">participants can edit appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="">Participants accept or decline appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="">Receive notification as appointment creator when participants accept or decline, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">Participants accept or decline your invitation, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </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 class="cap-calendar">participants can edit appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</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>
+<dt class="cap-calendar">scheduling, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">show birthday calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">Show declined appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </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 class="">show reminders for past appointments, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
 <dt class="cap-calendar">Start, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -390,15 +394,19 @@
 </dl></dd>
 <dt class="cap-webmail">Categories</dt>
 <dd><dl>
-<dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>
+<dt class="feat-io-ox-core-categories">browse, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">manage, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use for appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a>
+<dt class="feat-io-ox-core-categories">organize appointments with categories, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use for contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
+<dt class="feat-io-ox-core-categories">organize contacts with categories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use for emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a>
+<dt class="feat-io-ox-core-categories">organize emails with categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use for tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
+<dt class="feat-io-ox-core-categories">organize tasks with categories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a>
+</dt>
+<dt class="feat-io-ox-core-categories">use, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a>
 </dt>
 <dt class="cap-webmail">working with inbox categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>
 </dt>
@@ -456,6 +464,8 @@
 </dt>
 <dt class="cap-contacts">move, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a>
 </dt>
+<dt class="feat-io-ox-core-categories">organize with categories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a>
+</dt>
 <dt class="cap-contacts">print, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.print.html">Printing contacts</a>
 </dt>
 <dt class="cap-contacts">refresh and manage address book subscriptions, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.managesubscribed.html">Refreshing and managing address book subscriptions</a>
@@ -476,8 +486,6 @@
 </dt>
 <dt class="cap-contacts">subscribe to public and shared address books, <a class="indexterm" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a>
-</dt>
 <dt class="cap-contacts">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.contacts.attachments.html">Viewing or Saving Contact Attachments</a>
 </dt>
 </dl></dd>
@@ -655,7 +663,7 @@
 </dt>
 <dt class="cap-infostore">Sending files as email attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.send.html">Sending files as email attachments</a>
 </dt>
-<dt class="cap-infostore">settings, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">settings, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
 <dt class="cap-contacts">Subscribing to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared Drive folders</a>
 </dt>
@@ -676,15 +684,15 @@
 <dt class="cap-infostore">Working with versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">Drive settings</dt>
+<dt class="cap-infostore">Drivesettings</dt>
 <dd><dl>
-<dt class="cap-infostore">Add files, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">Add files, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
-<dt class="cap-infostore">show hidden files and folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">show hidden files and folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
-<dt class="cap-infostore">Slideshow for images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">Slideshow for images, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
-<dt class="cap-infostore">Version history, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">Version history, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
 </dl></dd>
 </dl>
@@ -713,10 +721,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</dt>
-<dd><dl><dt class="">notification sounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
-</dt></dl></dd>
-<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
+<dt class="">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
 </dt>
 <dd><dl>
 <dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
@@ -761,8 +766,6 @@
 </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>
@@ -805,6 +808,10 @@
 </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="feat-io-ox-core-categories">organize with categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a>
+</dt>
 <dt class="cap-webmail">permanently delete, <a class="indexterm" href="ox.appsuite.user.sect.email.remove.deleteforever.html">Permanently deleting emails</a>
 </dt>
 <dt class="cap-webmail">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.popup.html">The Email pop-up</a>
@@ -867,8 +874,6 @@
 </dt>
 <dt class="feat-io-ox-core-openai">use AI integration, <a class="indexterm" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a>
-</dt>
 <dt class="cap-webmail">use draft, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a>
 </dt>
 <dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
@@ -877,6 +882,8 @@
 </dt>
 <dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
+<dt class="cap-webmail">view, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a>
+</dt>
 <dt class="cap-webmail">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
 </dt>
 </dl></dd>
@@ -912,14 +919,10 @@
 </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>
-</dt>
-<dt class="cap-webmail">automatically collect contacts while sending, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
+<dt class="cap-webmail">automatic email address collection, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </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">compose dialog, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
-</dt>
 <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>
@@ -1187,19 +1190,21 @@
 </dt>
 <dt class="">backgrounds, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
-<dt class="">customize date and time formats, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+<dt class="">Customize date and time formats, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
 <dt class="">language, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
-<dt class="">look for new data every, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+<dt class="">Look for new data every, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </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 class="feat-io-ox-core-categories">manage categories, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>
 </dt>
 <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 class="">start app, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+</dt>
+<dt class="">time zone, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
 </dt>
-<dt class="">timezone, <a class="indexterm" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a>
+<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a>
 </dt>
 </dl></dd>
 <dt class="cap-edit_group">Groups</dt>
@@ -1236,10 +1241,10 @@
 </dt>
 <dt class="cap-smime">manage own S/MIME keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html">Managing own S/MIME keys</a>
 </dt>
-<dt class="cap-guard">manage PGP keys of recipients, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a>
-</dt>
 <dt class="cap-guard">manage S/MIME keys of recipients, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.smimepublickeys.html">Managing S/MIME keys of recipients</a>
 </dt>
+<dt class="cap-guard">Managing PGP keys of recipients, <a class="indexterm" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Managing PGP keys of recipients</a>
+</dt>
 <dt class="cap-guard">Office document encryption, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.html">Encrypting Office Documents</a>
 </dt>
 <dt class="cap-guard">open encrypted documents, <a class="indexterm" href="ox.appsuite.user.sect.guard.documents.open.html">Opening encrypted documents</a>
@@ -1260,7 +1265,7 @@
 </dt>
 <dt class="cap-guard">set up, <a class="indexterm" href="ox.appsuite.user.sect.guard.setup.html">Setting up Guard</a>
 </dt>
-<dt class="cap-guard">Settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</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>
@@ -1271,33 +1276,30 @@
 <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">Encrypt draft emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
-</dt>
-<dt class="cap-guard">show advanced settings for composing mail, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
-</dt>
-</dl></dd>
 <dt class="cap-guard">Guard settings</dt>
-<dd><dl><dt class="cap-guard">Compose options, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dd><dl><dt class="cap-guard">compose options, <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">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+<dt class="cap-guard">Autocrypt setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
+</dt>
+<dt class="cap-guard">Default adding signature to outgoing mails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">Autocrypt setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">default to send encrypted when composing email, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">Default adding signature to outgoing mails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<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 send encrypted when composing email, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">email cache setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">default to using PGP inline for new mails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Encrypt draft emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">email cache setting, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<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">Remember password default, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">reset options, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
-<dt class="cap-guard">reset options, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">show advanced settings for composing mail, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1497,12 +1499,11 @@
 </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="">Open notification area automatically, <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="">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 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>
@@ -1554,7 +1555,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>
@@ -1745,7 +1746,7 @@
 </dt>
 <dt class="">externally linked images in emails, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>
 </dt>
-<dt class="cap-guard">Guard settings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dt class="cap-guard">Guardsettings, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt>
 <dt class="cap-multifactor">multi-factor authentication, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.html">Multi-Factor Authentication</a>
 </dt>
@@ -1781,7 +1782,7 @@
 </dt>
 <dt class="cap-dataexport">download personal data, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a>
 </dt>
-<dt class="cap-infostore">Drive, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">Drive Settings</a>
+<dt class="cap-infostore">Drive, <a class="indexterm" href="ox.appsuite.user.sect.drive.settings.html">DriveSettings</a>
 </dt>
 <dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a>
 </dt>
@@ -1789,7 +1790,7 @@
 </dt>
 <dt class="cap-deputy">manage deputies, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.deputy.html">Managing Deputies</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>
 <dt class="">personal contact data, <a class="indexterm" href="ox.appsuite.user.sect.settings.personaldata.html">Changing Personal Contact Data</a>
 </dt>
@@ -1803,7 +1804,7 @@
 </dt>
 </dl></dd>
 <dt class="cap-guard">settings</dt>
-<dd><dl><dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">Guard Settings</a>
+<dd><dl><dt class="cap-guard">Guard, <a class="indexterm" href="ox.appsuite.user.sect.guard.settings.html">GuardSettings</a>
 </dt></dl></dd>
 <dt class="cap-share_mail_attachments">Share data, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.data.html">Which data can be shared?</a>, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.share.html">Sharing data</a>
 </dt>
@@ -1869,11 +1870,11 @@
 <dl>
 <dt class="">Task settings</dt>
 <dd><dl>
-<dt class="">notification as organizer, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">participants accept or decline tasks, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="">notification as participant, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">participants accept or decline your invitation, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
-<dt class="">notification on creation or change, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
+<dt class="">task invitations, changes or deletions, <a class="indexterm" href="ox.appsuite.user.sect.settings.notifications.html">Customizing the Notifications</a>
 </dt>
 </dl></dd>
 <dt class="cap-tasks">Tasks, <a class="indexterm" href="ox.appsuite.user.chap.tasks.html">Tasks</a>
@@ -1923,6 +1924,8 @@
 </dt>
 <dt class="cap-tasks">New task button, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.new.html">The New task button</a>
 </dt>
+<dt class="feat-io-ox-core-categories">organize with categories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a>
+</dt>
 <dt class="cap-tasks">print, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.print.html">Printing tasks</a>
 </dt>
 <dt class="cap-tasks">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.tasks.invitation.html">Responding to Task Invitations</a>
@@ -1939,8 +1942,6 @@
 </dt>
 <dt class="cap-tasks">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.tasks.gui.toolbar.html">The Tasks toolbar</a>
 </dt>
-<dt class="feat-io-ox-core-categories">use categories, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a>
-</dt>
 <dt class="cap-tasks">view, <a class="indexterm" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a>
 </dt>
 <dt class="cap-tasks">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.tasks.attachments.html">Viewing or Saving Task Attachments</a>
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 3c40ed113bcec2974b01467f6c8dab66798ebd85..b70526745a9c8719fe3790e8a6904dbb11f6f367 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
@@ -56,7 +56,7 @@
 <dd class="glossdef feat-io-ox-core-categories">
 <p role="presentation">Categories allow you to organize emails, appointments, contacts and tasks across apps, independently from the folder structure. This allows logically related objects to be identified and found more easily, for example all emails, appointments, contacts and tasks that belong to a specific project or customer. Depending on the configuration, specific categories are predefined. You can set your own categories.</p>
 <p role="presentation">Note: For emails, you can also use inbox tabs.</p>
-<p role="presentation">Related topics: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li></ul></p>
+<p role="presentation">Related topics: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p></li></ul></p>
 </dd>
 <dt class="cap-deputy" id="ox.appsuite.user.reference.about.glossary.deputy"><span class="glossterm">Deputy</span></dt>
 <dd class="glossdef cap-deputy">
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 3ab3ccdd365d59463c46a441429cb3f33026a482..d0f3e5f06dc133a1e77c75f9d6bd138e380e11a9 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
@@ -103,7 +103,7 @@
 <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" 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>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.add.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.display.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.display.html
index 2a43a88c4be8db7c7e44ca717698974719158452..2144ad3de97d408d682d1176ef88054c17bb30cd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.display.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.display.html
@@ -48,7 +48,7 @@
 <li class="step"><p role="presentation">If you do not want the appointment to conflict with overlapping appointments, enable <span class="guibutton"><strong>Show as free</strong></span>.</p></li>
 <li class="step">
 <p role="presentation">By default, an appointment gets the color of its calendar. In order to set an individual color for the appointment, click on <span class="guibutton"><strong>Appointment color</strong></span>. Select a color field.</p>
-<p role="presentation" class="feat-io-ox-core-categories">In the calendar settings, you can define that an appointment gets the color of the first category added when adding categories to the appointment. In this case, the <span class="guibutton"><strong>Appointment color</strong></span> button will be disabled.</p>
+<p role="presentation" class="feat-io-ox-core-categories">In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the calendar settings, you can define that an appointment gets the color of the first category added when adding categories to the appointment. In this case, the <span class="guibutton"><strong>Appointment color</strong></span> button will be disabled.</p>
 </li>
 <li class="step"><p role="presentation">In a shared calendar, you can use <span class="guibutton"><strong>Visibility</strong></span> to define the calendar's visibility for other users who are no participants. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In the default setting <span class="guibutton"><strong>Standard</strong></span>, the appointment is visible to all users who have the permission to see the calendar.</p></li>
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 f48de9c9ef288afc1c1e44d990ba7dfd4dc5ecd4..a6a7cf3fed11e5dfd2d561a59f098f08e5adde49 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
@@ -34,7 +34,7 @@
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Using the schedule view</h3></div></div></div>
 <a class="indexterm" name="id-1.8.10.15.2"></a><a class="indexterm" name="id-1.8.10.15.3"></a><a class="indexterm" name="id-1.8.10.15.4"></a><a class="indexterm" name="id-1.8.10.15.5"></a><p id="ox.appsuite.user.concept.calendar.add.scheduling">When scheduling an appointment with several participants or resources, the Scheduling view shows free and busy time periods for the users and resources.</p>
-<p id="ox.appsuite.user.hint.calendar.add.scheduling">Tip: In the calendar settings, you can define which users are allowed to view your appointments in the scheduling view.</p>
+<p id="ox.appsuite.user.hint.calendar.add.scheduling">Tip: In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the calendar settings, you can define which users are allowed to view your appointments in the scheduling view.</p>
 <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">
@@ -86,7 +86,7 @@
 <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>
 </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>
+<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">Scheduling</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">Creating Appointments</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.delete.html
index 5bb2dc3d1b01d5036656ff55bd27b01ab2f657c1..b5ba7dc0cee3c119ee26685d921a251c62b2814c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.delete.html
@@ -54,14 +54,7 @@
 <li class="listitem"><p role="presentation">When having selected the last appointment of the series, you can only delete the last appointment. In the latter case, you are not asked to appointments are to be deleted.</p></li>
 </ul>
 </li>
-<li class="listitem">
-<p role="presentation">If you are the appointment's organizer, you can inform other participants about the reason for the deletion by entering a message. The input field is shown if the following conditions are met: </p>
-<ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p role="presentation">The appointment has at least two participants.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Receive notification for appointment changes</strong></span> is enabled In the calendar settings.</p></li>
-</ul>
-<p role="presentation">The message will be sent as email.</p>
-</li>
+<li class="listitem"><p role="presentation">If you are the appointment's organizer, you can inform other participants about the reason for the deletion by entering a message. The message will be sent as email.</p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.delete">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html
index 70263e7aea06d5427a2481c650032cbb7a6c1551..1dce261b7a7a754aaa703ff999f5f305ed28cea8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.edit.html
@@ -101,7 +101,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</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>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p>
 </li></ul>
 <p> </p>
 <p class="title">Subordinated actions:</p>
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 3fef048a12dd94fa0911518621495ed7d3a1ea7d..3330e749ef564a9d4fcb43f58827322a2d216e6e 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
@@ -55,7 +55,7 @@
 <p id="ox.appsuite.user.options.calendar.folder.subscribe">Options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">The reminder that is set as default in the calendar settings is applied to all appointments of an iCAL calendar.</p>
+<p role="presentation">The reminder that is set as default reminder in the <span class="guibutton"><strong>Appointment reminders</strong></span> section of the calendar settings is used for all appointments of an iCal calendar.</p>
 <p role="presentation">In order to change this reminder for each appointment in this calendar, click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.reminder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Change reminders</strong></span>.</p>
 </li>
 <li class="listitem"><p role="presentation">In order to refresh the data you have subscribed to, click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.update"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Refresh this calendar</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html
index 313291fae535c9b3a83a11cd41500938150a4152..369e1f86a6ea26e51662548e3246f47d47ae3508 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
@@ -49,7 +49,7 @@
 <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>
-<li class="listitem"><p role="presentation">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>
+<li class="listitem"><p role="presentation">In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the calendar settings, use the <span class="guibutton"><strong>Subscribe to shared calendars</strong></span> button.</p></li>
 </ul></p>
 <p role="presentation">A window opens. It shows your private, the public and shared calendars.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.calendarview.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.calendarview.html
index bbf939751d5d8b834eade98bd9987f8adecdaa04..62e9008ddcf308a4e8d2183cbe13dc7b9df1542a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.calendarview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.calendarview.html
@@ -53,7 +53,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">Days of the week. The current weekday is highlighted in red.</p>
-<p role="presentation">In the calendar settings, you can define the number of days for a work week and the first day of a work week.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Your week</strong></span>section of the calendar settings, you can define the number of days for a work week and the first day of a work week.</p>
 </li>
 <li class="listitem"><p role="presentation">If clicking on a weekday, the window for creating a new whole day appointment opens.</p></li>
 <li class="listitem"><p role="presentation">The red line in the calendar sheet displays the current time.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.create.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.create.html
index 35446be3ba08a61dab3abdb3bafcf83d88906171..1e834237ffa26ff7c0b46e00857fad57658770d3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.create.html
@@ -49,7 +49,7 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Starts on</strong></span> and <span class="guibutton"><strong>Ends on</strong></span>. Set the start and end date of the appointment. Clicking on it opens the date picker.</p></li>
 <li class="listitem">
 <p role="presentation">If clicking on a timezone button next to a time, a window opens that allows you to select a time zone for the appointment's start and end time.</p>
-<p role="presentation">You can set frequently used time zones as favorites in the calendar settings.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Additional timezones</strong></span> section of the calendar settings, you can set frequently used time zones as favorites.</p>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>All day</strong></span>. Defines whether the appointment is supposed to last whole days.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Find a free time</strong></span>. Opens the scheduling view. In this view, you can find a free time when scheduling an appointment with several participants.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.settingsmenu.html
index 2ddc0719ac030d158e472fee5f3b850895e4a121..9205eb99da6e5b0c2958668ef5f46dfa73c2df29 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.settingsmenu.html
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation">Adjust all settings</p></li>
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Show mini calendar</strong></span>. Defines whether the mini calendar will be displayed above the folder view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.7.6.3.3.4"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Browse categories</strong></span>. Shows all objects that have been marked with a specific category.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Print</strong></span>. Opens a print view of the current calendar view.</p></li>
 <li class="listitem"><p role="presentation">Subscribe to shared calendars, subscribe to or import other calendars</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
@@ -50,6 +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.calendar.settings.html">Calendar Settings</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a></p>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a></p>
 <p role="presentation" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</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 43f4069a5614b5452f9815f128e1cb373f0cf0e7..76cad54ac2a247794e83e243c668abc0d2aab0ef 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
@@ -56,7 +56,7 @@
 </ol></div>
 <div class="taskrelated">
         <p>Result: The appointment will be added to your calendar.</p>
-        <p>Note: In the calendar settings, you can define whether declined appointments will be displayed.</p>
+        <p>Note: In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the calendar settings, you can define whether declined appointments will be displayed.</p>
       </div>
 </div>
 <div class="task" id="ox.appsuite.user.task.calendar.invitation.email">
@@ -73,7 +73,7 @@
 </ol></div>
 <div class="taskrelated">
         <p>Result: If you accept the appointment, it will be entered in your calendar.</p>
-        <p>Note: In the calendar settings you can define whether the invitation mail is automatically deleted when accepting or declining an appointment.</p>
+        <p>Note: In the <span class="guibutton"><strong>Calendar</strong></span>section of the notification settings, you can define whether the invitation mail is automatically deleted when accepting or declining an appointment.</p>
       </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.invitation"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html
index cc286928788c37ac99e3b70d3aa0b7498ed4222b..7ebf22dd80f6f8eaef25037f13327077e55b319b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.categories.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using categories for appointments</title>
+<title>Organizing appointments with categories</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,13 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.categories">
-<div class="titlepage"><div><div><h3 class="title">Using categories for appointments</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Organizing appointments with categories</h3></div></div></div>
 <a class="indexterm" name="id-1.8.16.11.2"></a><a class="indexterm" name="id-1.8.16.11.3"></a><a class="indexterm" name="id-1.8.16.11.4"></a><p id="ox.appsuite.user.concept.calendar.manage.categories">To organize appointments independently from calendars, you can use categories. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can mark appointments with categories.</p></li>
 <li class="listitem"><p role="presentation">You can display all appointments that have been marked with a specific category.</p></li>
 </ul>
-<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.manage.categories">
 <p class="title">How to mark appointments with a category:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -67,20 +67,25 @@
 <li class="listitem"><p role="presentation">The list view shows all appointments that have been marked with this category.</p></li>
 <li class="listitem"><p role="presentation">To display the previous view, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
 </ul>
-          <p>Tip: As an alternative you can use the search.</p>
+          <p>Options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can also search for appointments with a specific category.</p></li>
+<li class="listitem"><p role="presentation">To show all objects that have been marked with a specific category, you can browse the categories.</p></li>
+</ul>
         </div>
 </div>
 <p id="ox.appsuite.user.related.calendar.manage.categories"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.search.html">Searching for Appointments</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
index 5f35363fe0d9d7b0ceed3f77d12ac461d68223e9..03ae750e9c1572c0cb8bc99cbb8bf48a7491cd0a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Using categories for appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Organizing appointments with categories">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.move.html" title="Moving appointments to another calendar">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
index 1f7f5dc29796e98e90387dbb24fab42831ef74eb..b498d7023d896b5a86f6be0ca5890d3d01b05b58 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
@@ -38,7 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite time zones</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.16.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.16.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.move.html">Moving appointments to another calendar</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a></p></li>
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 b6be8e2cb76c3732fa6b027a045d956851bcdbdc..d53dc900f357e69ea6b007a5f34ade9f1b188a1e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.timezones.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.manage.html" title="Managing Appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Changing the organizer">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Using categories for appointments">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.categories.html" title="Organizing appointments with categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
index 5ed537f3ff8cfbdb386e28dc5cc3ba1cd014ddb9..9f4fed1be8d055bf9e57f926a384795eccd8fc52 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.search.html
@@ -76,7 +76,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.19.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.19.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.settings.html
index bdbd613f8ebc82686b2a0a9570bafe4cab23599d..edc90c3bcf732a03bda3aec3687cf3da9deedf76 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
@@ -43,28 +43,31 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.calendar.settings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.calendar.settings">The settings can be found in the following sections: </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.layout">Layout</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.yourweek">Your week</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.reminder">Appointment reminders</a></p></li>
-<li class="listitem feat-jitsi" id="id-1.8.24.5.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi meetings</a></p></li>
-<li class="listitem feat-zoom" id="id-1.8.24.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.zoom">Zoom meetings</a></p></li>
+<li class="listitem feat-jitsi" id="id-1.8.24.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.settings.html#ox.appsuite.user.reference.calendar.settings.jitsi">Jitsi meetings</a></p></li>
+<li class="listitem feat-zoom" id="id-1.8.24.5.1.5"><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.layout"></p>
+<h3 class="title">Layout</h3>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.layout.interval"><b>Time scale. </b><a class="indexterm" name="id-1.8.24.6.2.1.1.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>
 <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.8.24.6.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime"><b>Working time. </b><a class="indexterm" name="id-1.8.24.7.2.1.1.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.start"><b>Start. </b><a class="indexterm" name="id-1.8.24.6.2.1.1.1.3.1.1.1.2"></a>Defines the start of the working hours.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.end"><b>End. </b><a class="indexterm" name="id-1.8.24.6.2.1.1.1.3.1.2.1.2"></a>Defines the end of the working hours.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.interval"><b>Time scale. </b><a class="indexterm" name="id-1.8.24.6.2.1.1.1.3.1.3.1.2"></a>Specifies the interval for dividing the time grid in the <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span>, <span class="guibutton"><strong>Week</strong></span> calendar views.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.start"><b>Start. </b><a class="indexterm" name="id-1.8.24.7.2.1.1.1.3.1.1.1.2"></a>Defines the start of the working hours.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workingtime.end"><b>End. </b><a class="indexterm" name="id-1.8.24.7.2.1.1.1.3.1.2.1.2"></a>Defines the end of the working hours.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Work week. </b><a class="indexterm" name="id-1.8.24.6.2.1.2.1.2"></a></p>
+<p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek"><b>Work week. </b><a class="indexterm" name="id-1.8.24.7.2.1.2.1.2"></a></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.start"><b>First day. </b>Defines the beginning of a work week.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.yourweek.workweek.length"><b>Length. </b>Defines the number of days of a work week.</p></li>
@@ -74,7 +77,7 @@
 </ul>
 <p id="ox.appsuite.user.reference.calendar.settings.reminder"></p>
 <h3 class="title">Appointment reminders</h3>
-<p><a class="indexterm" name="id-1.8.24.7.2"></a>Defines default settings for new appointments. </p>
+<p><a class="indexterm" name="id-1.8.24.8.2"></a>Defines default settings for new appointments. </p>
 <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
 <p role="presentation">Default reminder when newly creating the following appointments: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
@@ -90,21 +93,21 @@
 <div id="ox.appsuite.user.reference.calendar.settings.jitsi" class="feat-jitsi">
 <p id="ox.appsuite.user.reference.calendar.settings.jitsi"></p>
 <h3 class="title">Jitsi meetings</h3>
-<p><a class="indexterm" name="id-1.8.24.9.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Jitsi Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.24.9.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
+<p><a class="indexterm" name="id-1.8.24.10.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Jitsi Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.jitsi.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.24.10.3.3.1.1.2"></a>Defines whether the link for the Jitsi meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li></ul>
 <p> See <a class="xref" href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a></p>
 </div>
 <div id="ox.appsuite.user.reference.calendar.settings.zoom" class="feat-zoom">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom"></p>
 <h3 class="title">Zoom meetings</h3>
-<p><a class="indexterm" name="id-1.8.24.10.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Zoom Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
+<p><a class="indexterm" name="id-1.8.24.11.2"></a>With those options, you can define the behavior if you select <span class="guibutton"><strong>Zoom Meeting</strong></span> in the <span class="guibutton"><strong>Conference</strong></span> drop-down when creating appointments. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments"><b>Appointments. </b></p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Always add a random meeting password. </b><a class="indexterm" name="id-1.8.24.10.3.3.1.1.2.1.1.1.2"></a>Defines whether the conference will be secured by an automatically created password.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.24.10.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copy dial-in information to description. </b><a class="indexterm" name="id-1.8.24.10.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.password"><b>Always add a random meeting password. </b><a class="indexterm" name="id-1.8.24.11.3.3.1.1.2.1.1.1.2"></a>Defines whether the conference will be secured by an automatically created password.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.location"><b>automatically copy link to location. </b><a class="indexterm" name="id-1.8.24.11.3.3.1.1.2.1.2.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.appointments.dialin"><b>copy dial-in information to description. </b><a class="indexterm" name="id-1.8.24.11.3.3.1.1.2.1.3.1.2"></a>Defines whether the link for the Zoom meeting participation will be copied to the <span class="guibutton"><strong>Location</strong></span> field.</p></li>
 </ul>
 </li>
 <li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.zoom.dialinnumber"><b>Dial-in numbers. </b>If you at least have a Zoom Pro account, Zoom offers dial-in numbers per country. To define the countries to be displayed in in appointment invitations, click on <span class="guibutton"><strong>Open Zoom profile</strong></span>.</p></li>
@@ -113,24 +116,34 @@
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings.advanced"></p>
 <h3 class="title">Advanced settings</h3>
-<p><a class="indexterm" name="id-1.8.24.11.2"></a></p>
+<p><a class="indexterm" name="id-1.8.24.12.2"></a></p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<p id="ox.appsuite.user.reference.calendar.settings.advanced.calendar"><b>Calendar. </b></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.calendar.birthdaycalendar"><b>Show birthday calendar. </b><a class="indexterm" name="id-1.8.24.12.3.1.1.1.2.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.calendar.declined"><b>Show declined appointments. </b><a class="indexterm" name="id-1.8.24.12.3.1.1.1.2.1.2.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.calendar.subscribeshared"><b>Subscribe to shared calendars. </b><a class="indexterm" name="id-1.8.24.12.3.1.1.1.2.1.3.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>
+</ul>
+</li></ul>
+<p> </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.birthdaycalendar"><b>Show birthday calendar. </b><a class="indexterm" name="id-1.8.24.11.3.1.1.1.2"></a>Defines whether a birthday calendar is displayed in the folder view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.reminderspast"><b>show reminders for past appointments. </b><a class="indexterm" name="id-1.8.24.11.3.1.2.1.2"></a>Defines whether appointment reminders are displayed for past  appointments.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.8.24.11.3.1.3.1.2"></a>Defines in which cases appointment invitations by external contacts automatically will be added to your calendar. </p>
+<p id="ox.appsuite.user.reference.calendar.settings.advanced.appointments"><b>Appointments. </b></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.appointments.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.24.12.3.2.1.1.2.1.1.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.appointments.wholeday"><b>Automatically mark all day appointments as “free” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.24.12.3.2.1.1.2.1.2.1.2"></a>Defines whether all day appointments are displayed as free by default.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.8.24.12.3.2.1.1.2.1.3"><p id="ox.appsuite.user.reference.calendar.settings.advanced.appointments.categorycolor"><b>use first category color for appointments. </b><a class="indexterm" name="id-1.8.24.12.3.2.1.1.2.1.3.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">use categories</a></p></li>
+</ul>
+</li>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.calendar.settings.advanced.emailchanges"><b>Automatically apply appointment changes received via email to your calendar. </b><a class="indexterm" name="id-1.8.24.12.3.2.2.1.2"></a>Defines in which cases appointment invitations by external contacts automatically will be added to your calendar. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Never</strong></span>. The appointment change will not be applied automatically. The email invitation includes a button for adding the appointment to your calendar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Only from known senders</strong></span>. The appointment change will be applied automatically if the appointment change comes from a sender who is entered as appointment participant or is entered as a contact in one of your address books.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Always</strong></span>. The appointment change will always be automatically added to your calendar.</p></li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Show free/busy information to others. </b><a class="indexterm" name="id-1.8.24.11.3.1.4.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.usedforsync"><b>Subscribe to shared calendars. </b><a class="indexterm" name="id-1.8.24.11.3.1.5.1.2"></a>See <a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.declined"><b>Show declined appointments. </b><a class="indexterm" name="id-1.8.24.11.3.1.6.1.2"></a>Defines whether appointments that you declined are displayed. See <a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.participantsedit"><b>Always mark “Participants can edit appointments” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.24.11.3.1.7.1.2"></a>Defines whether participants by default get the permission to edit an appointment.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.wholeday"><b>Automatically mark all day appointments as “free” when creating or editing appointments. </b><a class="indexterm" name="id-1.8.24.11.3.1.8.1.2"></a>Defines whether all day appointments are displayed as free by default.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.8.24.11.3.1.9"><p id="ox.appsuite.user.reference.calendar.settings.advanced.categorycolor"><b>use first category color for appointments. </b><a class="indexterm" name="id-1.8.24.11.3.1.9.1.2"></a>Defines whether appointments to which you have assigned a category are displayed in the color of that category. When assigning multiple categories to an appointment, the color of the initially assigned category will be used. See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.calendar.settings.advanced.hidefreebusy"><b>Scheduling. </b><a class="indexterm" name="id-1.8.24.12.3.2.3.1.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the schedule view</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
 <p class="title">User interface:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.appointments.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.appointments.html
index 42aef4063c71995ea868556bddef01df80c9cde1..07306b75257a7e4fa432dcda44364f9d6b1d067b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.appointments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.appointments.html
@@ -60,7 +60,7 @@
 <li class="listitem"><p role="presentation">An appointment with the status Maybe will be displayed in its appointment color. The subject is preceded by a question mark icon.</p></li>
 <li class="listitem">
 <p role="presentation">An appointment that you have declined will be displayed in gray. The subject will be preceded by the <span class="guibutton"><strong>Declined</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.declined"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> icon. The subject is crossed out.</p>
-<p role="presentation">In the calendar settings, you can define whether declined appointments will be displayed.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the calendar settings, you can define whether declined appointments will be displayed.</p>
 </li>
 <li class="listitem feat-io-ox-core-implicitCancel" id="id-1.8.8.8.6.2.1.6"><p role="presentation">An appointment that has been declined by all other participants will be marked with the <span class="guibutton"><strong>All declined</strong></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> icon.</p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.timezones.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.timezones.html
index 84e90b59343e9d43513eebc668e044677de21006..e6fcaa9818aa5b80e4bf1243ae51bbb67fac32fb 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.timezones.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.timezones.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Viewing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.view.timezones">
 <div class="titlepage"><div><div><h3 class="title">Displaying multiple time zones</h3></div></div></div>
-<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In addition to the default timezone, you can display time zones that you have  added to favorites. The default timezone can be changed in the basic settings.</p>
+<a class="indexterm" name="id-1.8.8.7.2"></a><a class="indexterm" name="id-1.8.8.7.3"></a><p id="ox.appsuite.user.concept.calendar.view.timezones">In addition to the default time zone, you can display time zones that you have  added to favorites. The default time zone can be changed in the <span class="guibutton"><strong>Language &amp; time zone</strong></span> section of the general settings.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.timezones">
 <p class="title">How to display multiple time zones in a calendar view:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.edit.html
index ff15163a1c9253054e60d237367d7b803c573090..57df4696c5289c7ca5ab572341ea9ae92002af0d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.edit.html
@@ -57,7 +57,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.distributionlist.add.html">Creating new distribution lists</a></p>
 </li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.14.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.14.9.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p></li>
 </ul>
 <p> </p>
 <p class="title">Subordinated actions:</p>
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 0beb4a2ae9a4d79a18a73b4bba100bca017c45ca..f7ba5c9d55d83038d8f81d98bb4e183674b5b232 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
@@ -49,7 +49,7 @@
 <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>
+<li class="listitem"><p role="presentation">In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the address book settings, use the <span class="guibutton"><strong>Subscribe to shared address books</strong></span> button.</p></li>
 </ul></p>
 <p role="presentation">A window opens. It shows your private, the public and shared address books.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
index 1d75345415c2adc98e87d435ed948930267b7394..b69b6b6bc67293f7d55c66a688f4f43db7993f52 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.detailview.html
@@ -72,7 +72,7 @@
 <li class="listitem"><p role="presentation">Business and private fax numbers</p></li>
 <li class="listitem">
 <p role="presentation">Private address, business address, other address</p>
-<p role="presentation">In the address book settings, you can define whether a map service link for showing an address should be displayed.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Names &amp; Addresses</strong></span> section of the address book settings, you can define whether a map service link for showing an address should be displayed.</p>
 </li>
 <li class="listitem"><p role="presentation">A note</p></li>
 <li class="listitem"><p role="presentation">Maximum 18 optional user fields</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
index 8aeecb7e490320ef86feaed7b7053fdaca3989b3..22823a492474bf18fd36004d7f94effebe3f0774 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.gui.settingsmenu.html
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation">Adjust all settings</p></li>
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>List options</strong></span>. Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.7.6.3.3.4"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Browse categories</strong></span>. Shows all objects that have been marked with a specific category.</p></li>
 <li class="listitem"><p role="presentation">subscribe to shared or other address books</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 </ul>
@@ -48,6 +49,7 @@
 <p class="title">Instructions:</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.settings.html">Address Book Settings</a></p>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribe.html">Subscribing to external address books</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html
index 47b0ed4e1425ab81e6cb69439e5d44438e46e584..7740e9c3c90e0d3ed496966f9becbd12b83bc810 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.categories.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using categories for contacts</title>
+<title>Organizing contacts with categories</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,13 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Address Book</span></h1>
 <h2 class="sr-only">Managing Contacts</h2>
 <div class="sect2" id="ox.appsuite.user.sect.contacts.manage.categories">
-<div class="titlepage"><div><div><h3 class="title">Using categories for contacts</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Organizing contacts with categories</h3></div></div></div>
 <a class="indexterm" name="id-1.9.17.9.2"></a><a class="indexterm" name="id-1.9.17.9.3"></a><p id="ox.appsuite.user.concept.contacts.manage.categories">To organize contacts independently from folders, you can use categories. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can mark contacts with categories.</p></li>
 <li class="listitem"><p role="presentation">You can display all contacts that have been marked with a specific category.</p></li>
 </ul>
-<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>.</p>
 <div class="task" id="ox.appsuite.user.task.contacts.manage.categories">
 <p class="title">How to mark contacts with a category:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -64,20 +64,25 @@
 <li class="listitem"><p role="presentation">The list view shows all contacts that have been marked with this category.</p></li>
 <li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.contacts.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
 </ul>
-          <p>Tip: As an alternative you can use the search.</p>
+          <p>Options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can also search for contacts with a specific category.</p></li>
+<li class="listitem"><p role="presentation">To show all objects that have been marked with a specific category, you can browse the categories.</p></li>
+</ul>
         </div>
 </div>
 <p id="ox.appsuite.user.related.contacts.manage.categories"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.search.html">Searching for Contacts</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
index 8e8f55dd648f48bdc1067a6f6295f7ae65899d83..c422487b1ce35ddb91c092ddd181ed1477099e1a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.html
@@ -36,7 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem cap-webmail" id="id-1.9.17.4.1.1"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a></p></li>
 <li class="listitem cap-calendar" id="id-1.9.17.4.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.17.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.movecopy.html">Moving or copying contacts</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
index 13d3bbef6de65268579174e800a9999548c94d98..5d080564a49683631960729ee5720617d9daf9cf 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.inviteappointment.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
 <link rel="prev" href="ox.appsuite.user.sect.contacts.manage.sendmail.html" title="Sending emails from within an address book">
-<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Using categories for contacts">
+<link rel="next" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Organizing contacts with categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html
index c4b8bf84d1cf35702be7040aad0cf220f93bb2bf..969a10ae710496deed8e75e89d0629dccccd4c36 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.manage.movecopy.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.contacts.manage.html" title="Managing Contacts">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Using categories for contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.categories.html" title="Organizing contacts with categories">
 <link rel="next" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html" title="Sending contacts as vCard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
index 8f79513cf7b56765626ef5a7c5beddcd8df38b6e..9d240380be323cd128eb896192a929a769884330 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.search.html
@@ -82,7 +82,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.9.19.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.9.19.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.contacts.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.contacts.html"><i><span class="phrase">Address Book</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.settings.html
index f560b0a0d584b12934bdb23670601c1aee9f5078..15222c67877c03f77ed9b58a53465f6e6a48efdb 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
@@ -43,7 +43,7 @@
 <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>
-<p id="ox.appsuite.user.reference.contacts.settings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.contacts.settings">The settings can be found in the following sections: </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.advanced">Advanced settings</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
index 053719357254114c048d7ad6afd0f35e1cc16627..7dc0a2fd54824f094b335f52e435d3b72a6b2354 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.contacts.view.haloview.html
@@ -56,7 +56,7 @@
 <li class="listitem"><p role="presentation">Personal data, business data</p></li>
 <li class="listitem"><p role="presentation">Email addresses. If clicking on an email address, the page for sending a new email is displayed.</p></li>
 <li class="listitem"><p role="presentation">Business and private phone numbers. If clicking on a number, a function for making a call opens, if available.</p></li>
-<li class="listitem"><p role="presentation">Business and private addresses. In the address book settings, you can define whether a map service for displaying the address should be used when clicking on an address.</p></li>
+<li class="listitem"><p role="presentation">Business and private addresses. In the <span class="guibutton"><strong>Names &amp; Addresses</strong></span> section of the address book settings, you can define whether a map service for displaying the address should be used when clicking on an address.</p></li>
 <li class="listitem"><p role="presentation">Attachments</p></li>
 </ul></p></li>
 <li class="listitem"><p role="presentation">The address book in which the contact is saved</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 335105a952bf3494b52438d8e9a1dc68a5b975e8..9fe07adc34793054659b27c1a14d0fa7985ad41a 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
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.dataorganisation.accounts.html" title="Managing Accounts">
 <link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.functionalmail.html" title="Disabling or enabling functional email accounts">
-<link rel="next" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="Managing Categories">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="use categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.browse.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.browse.html
new file mode 100644
index 0000000000000000000000000000000000000000..7bf06ab28a26daa19570390c01f7c2c12c6124c4
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.browse.html
@@ -0,0 +1,98 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Browsing categories</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="use categories">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html" title="Managing Categories">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Downloading Personal 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"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.categories.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.dataorganisation.downloadpersonaldata.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Data Organization and Shares</h1>
+<h2 class="sr-only">use categories</h2>
+<div class="sect2" id="ox.appsuite.user.sect.dataorganisation.categories.browse">
+<div class="titlepage"><div><div><h3 class="title">Browsing categories</h3></div></div></div>
+<a class="indexterm" name="id-1.12.8.9.2"></a><a class="indexterm" name="id-1.12.8.9.3"></a><p id="ox.appsuite.user.concept.dataorganisation.categories.browse">To find objects that have been marked with a specific category, you can browse the categories. You will be presented with all emails, appointments, contacts and tasks that have been marked with the same category. You have the following options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">browse categories while displaying an object</p></li>
+<li class="listitem"><p role="presentation">browse categories by opening the category browser</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.dataorganisation.categories.browse.objects">
+<p class="title">How to browse categories while displaying an object:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">Select an object to which a category has been assigned. You have the following options: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">If having selected an email, an appointment in the list view, a contact or a task, click on a category in the detail view.</p></li>
+<li class="listitem"><p role="presentation">If having selected an appointment in a calendar view, click on a category in the pop-up.</p></li>
+</ul></p>
+<p role="presentation">The <span class="guilabel"><strong>Browse categories</strong></span> sidebar will be displayed. In the sidebar, all objects are displayed to which the category selected has been assigned. Per each app, a maximum of five objects will be displayed.</p>
+</li>
+<li class="step"><p role="presentation">Use the following functions: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">To show the details of an object in the pop-up, click on the object in the sidebar.</p>
+<p role="presentation">To edit the object, use the functions in the pop-up.</p>
+</li>
+<li class="listitem">
+<p role="presentation">If more than five objects per app will be found, the <span class="guibutton"><strong>Show all</strong></span> button will be displayed below the objects.</p>
+<p role="presentation">To display all objects that have been found for an app, click on <span class="guibutton"><strong>Show all</strong></span>. The objects will be displayed in the respective app as search result.</p>
+</li>
+</ul></p></li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.dataorganisation.categories.browse.sidebar">
+<p class="title">How to browse categories by opening the category browser:</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.dataorganisation.categories.sidebar"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Browse categories</strong></span>.</p>
+<p role="presentation">The <span class="guilabel"><strong>Browse categories</strong></span> sidebar will be displayed. It does not yet contain any objects as long as no category has been selected.</p>
+</li>
+<li class="step">
+<p role="presentation">To display the objects of a specific category, select at least one category in <span class="guibutton"><strong>Categories</strong></span>. You can also select one of the previously used categories.</p>
+<p role="presentation">In the sidebar, all objects are displayed to which the category selected has been assigned. Per each app, a maximum of five objects will be displayed.</p>
+</li>
+<li class="step"><p role="presentation">Use the following functions: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation">To show the details of an object in the pop-up, click on the object in the sidebar.</p>
+<p role="presentation">To edit the object, use the functions in the pop-up.</p>
+</li>
+<li class="listitem">
+<p role="presentation">If more than five objects per app will be found, the <span class="guibutton"><strong>Show all</strong></span> button will be displayed below the objects.</p>
+<p role="presentation">To display all objects that have been found for an app, click on <span class="guibutton"><strong>Show all</strong></span>. The objects will be displayed in the respective app as search result.</p>
+</li>
+</ul></p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.dataorganisation.categories.browse"></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" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.dataorganisation.categories.browse">Parent topic: <a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</i></a></p>
+</div>
+          </div>
+        </body>
+</html>
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 4975e36819dbc4b11729d34d1c3dfcee202f07a1..16e5c7bdd7cf6f28e4d43f9f80898d106a57074e 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
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Managing Categories</title>
+<title>use categories</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.dataorganisation.html" title="Data Organization and Shares">
 <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.dataorganisation.downloadpersonaldata.html" title="Downloading Personal Data">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html" title="Managing Categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,61 +25,38 @@
 <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.dataorganisation.downloadpersonaldata.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only">Data Organization and Shares</h1>
 <div class="sect1" id="ox.appsuite.user.sect.dataorganisation.categories">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Categories</h2></div></div></div>
-<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to manage <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to organize emails, appointments, contacts and tasks across apps, independently from the folder structure. You e.g. can use an own category for a specific project or customer. Categories have the following properties: </p>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">use categories</h2></div></div></div>
+<a class="indexterm" name="id-1.12.8.2"></a><a class="indexterm" name="id-1.12.8.3"></a><p id="ox.appsuite.user.orientation.dataorganisation.categories">Learn how to use <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.categories">categories</a> that allow you to organize emails, appointments, contacts and tasks across apps, independently from the folder structure. You e.g. can use an own category for a specific project or customer.</p>
+<p id="ox.appsuite.user.concept.dataorganisation.categories">Categories have the following properties: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">A category consists of a name and a color.</p></li>
-<li class="listitem"><p role="presentation">When searching for objects, you can use categories as search terms.</p></li>
-<li class="listitem"><p role="presentation">Depending on the configuration, specific categories are predefined. Such categories can neither be edited nor deleted.</p></li>
-<li class="listitem"><p role="presentation">You can create, edit and delete own categories.</p></li>
-<li class="listitem"><p role="presentation">You can assign a category or several categories to emails, appointments, contacts and tasks and delete them later.</p></li>
-</ul>
-<p> Note: For emails, you can also use inbox tabs. A specific inbox category can be assigned to an email. The category depends on the sender, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
-<p id="ox.appsuite.user.concept.dataorganisation.categories">You have the following options: </p>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">create an own category</p></li>
-<li class="listitem"><p role="presentation">edit an own category</p></li>
-<li class="listitem"><p role="presentation">delete an own category</p></li>
-</ul>
-<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 help-hide-inline">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> on the right side of the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane. Click on <span class="guibutton"><strong>Manage categories</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span>.</p>
-<p role="presentation">You can also use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Select an email. Click the <span class="guibutton"><strong>Add category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the toolbar. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Open the editing window for appointments, contacts or tasks by creating or editing an appointment, a contact or a task.</p>
-<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p>
+<p role="presentation">You can create, edit and delete own categories.</p>
+<p role="presentation">Depending on the configuration, specific categories are predefined. Such categories can neither be edited nor deleted.</p>
 </li>
-</ul></p>
-<p role="presentation">The <span class="guilabel"><strong>Manage categories</strong></span> window opens.</p>
+<li class="listitem">
+<p role="presentation">You can assign a category or several categories to emails, appointments, contacts and tasks and delete them later.</p>
+<p role="presentation">Note: For emails, you can also use inbox tabs. A specific inbox category can be assigned to an email. The category depends on the sender, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
 </li>
-<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 class="listitem"><p role="presentation">If you are searching for objects in an app, you can use categories as search terms.</p></li>
+<li class="listitem"><p role="presentation">You can browse categories to find objects to which a specific category has been assigned in any app.</p></li>
+</ul>
+<p id="ox.appsuite.user.possibilities.dataorganisation.categories">You have the following options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></p>
+<p role="presentation">Create, edit or delete own categories with which you can mark emails, appointments, contacts or tasks.</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>
-<p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p>
+<li class="listitem">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
+<p role="presentation">Find all emails, appointments, contacts and tasks that have been marked wit the same category.</p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html">Adjusting the General Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.categories">Parent topic: <a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.manage.html
new file mode 100644
index 0000000000000000000000000000000000000000..50b1216b96f79a0b0cbfd5d9e46d548c2ec9c337
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.categories.manage.html
@@ -0,0 +1,77 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Managing Categories</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="use categories">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="use categories">
+<link rel="next" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html" title="Browsing categories">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.categories.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only">Data Organization and Shares</h1>
+<h2 class="sr-only">use categories</h2>
+<div class="sect2" id="ox.appsuite.user.sect.dataorganisation.categories.manage">
+<div class="titlepage"><div><div><h3 class="title">Managing Categories</h3></div></div></div>
+<a class="indexterm" name="id-1.12.8.8.2"></a><a class="indexterm" name="id-1.12.8.8.3"></a><p id="ox.appsuite.user.concept.dataorganisation.categories.manage">You have the following options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">create an own category</p></li>
+<li class="listitem"><p role="presentation">edit an own category</p></li>
+<li class="listitem"><p role="presentation">delete an own category</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.dataorganisation.categories.manage">
+<p class="title">How to manage your categories:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step help-hide-inline">
+<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.manage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> on the right side of the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane. Click on <span class="guibutton"><strong>Manage categories</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span>.</p>
+<p role="presentation">You can also use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Select an email. Click the <span class="guibutton"><strong>Add category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.dataorganisation.categories.manage.toolbar"><object type="image/svg+xml" data="../../images/tags.svg" height="15"></object></span> in the toolbar. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p></li>
+<li class="listitem">
+<p role="presentation">Open the editing window for appointments, contacts or tasks by creating or editing an appointment, a contact or a task.</p>
+<p role="presentation">To do so, click on <span class="guibutton"><strong>Add category</strong></span> next to <span class="guibutton"><strong>Categories</strong></span>. Select <span class="guibutton"><strong>Manage categories</strong></span>.</p>
+</li>
+</ul></p>
+<p role="presentation">The <span class="guilabel"><strong>Manage categories</strong></span> window opens.</p>
+</li>
+<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="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.manage.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.manage.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.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" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.dataorganisation.categories.manage">Parent topic: <a class="xref" href="ox.appsuite.user.chap.dataorganisation.html"><i>Data Organization and Shares</i></a></p>
+</div>
+          </div>
+        </body>
+</html>
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 6aad28004ccb5c55078048378b8c3c930785c282..323c496f3d4be486984fb8aff6cd89c2c82c1036 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
@@ -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.dataorganisation.html" title="Data Organization and Shares">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.categories.html" title="Managing Categories">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html" title="Browsing categories">
 <link rel="next" href="ox.appsuite.user.chap.security.html" title="Data Security">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.categories.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.categories.browse.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.security.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.accounts.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.accounts.html
index 18bd2d070c1a991b6f6190c8ee0f714a2995b71f..f15e1ce99f49493c23e1694f8a2b45c86d55e0ae 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.accounts.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.accounts.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.drive.html" title="Drive">
 <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.drive.settings.html" title="Drive Settings">
+<link rel="next" href="ox.appsuite.user.sect.drive.settings.html" title="DriveSettings">
 <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.drive.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.settingsmenu.html
index afbd7f28a645b56084f8e90a921bdca133abb444..8f1d922d5c80e831dfef735e23a095b6473c30ad 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.settingsmenu.html
@@ -50,7 +50,7 @@
 <p> </p>
 <p class="title">Instructions:</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.settings.html"><span class="phrase">Drive</span> Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html"><span class="phrase">Drive</span>Settings</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared <span class="phrase">Drive</span> folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.wizard.html">Using a Wizard to Set Up Local Apps</a></p>
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 a4940814f19da192737a1957118e11753c5b070f..2a4bb47b6ce818bdcd9023fc543a4f167b6c88c7 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
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Drive Settings</title>
+<title>DriveSettings</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">Drive</span></h1>
 <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>
+<span class="phrase">Drive</span>Settings</h2></div></div></div>
 <a class="indexterm" name="id-1.11.19.2"></a><a class="indexterm" name="id-1.11.19.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">
@@ -44,7 +44,7 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Drive</strong></span> in the left pane.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.drive.settings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.drive.settings">The settings can be found in the following sections: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.settings.html#ox.appsuite.user.reference.drive.settings.adddrive">Add files</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.versionhistory">Version history</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html
index b764e04ac17cb2450aba6fab3b4c2e06ef1dc78c..dedbd875d05ff8138be289ef112cb00461c953cc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html
@@ -41,7 +41,7 @@
 <li class="step">
 <p role="presentation">Select a local file or multiple local files in the <span class="guilabel"><strong>Upload file</strong></span> window.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Open</strong></span>. The current progress status will be shown in the display area.</p>
-<p role="presentation">In the <a class="link" href="ox.appsuite.user.sect.drive.settings.html">Settings</a>, you can define whether a new file or a new version of a possibly existing file with the same name should be created.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Add files</strong></span> section of the  <span class="phrase">Drive</span> settings, you can define whether a new file or a new version of a possibly existing file with the same name should be created.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
index a73d300ed2491b087f5151f6d384c0f70e4c349a..53244d925cf447526c7e5fb065eba0e3728400bc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation">The following details are displayed for each email: Sender, subject, date of receipt. Unread E-Mails are marked with the <span class="guibutton"><strong>Unread</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">A tooltip on a sender's name shows the sender's email address.</p></li>
 <li class="listitem"><p role="presentation">If available, additional information is shown: attachment icons, colored label or flag, number of emails in a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversation</a>, priority.</p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.11.5.1.7"><p role="presentation">If available, the assigned categories will be displayed. In the E-Mail settings, you can specify whether assigned categories are displayed in the list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.11.5.1.7"><p role="presentation">If available, the assigned categories will be displayed. In the <span class="guibutton"><strong>Reading</strong></span> section of the E-Mail settings, you can specify whether assigned categories are displayed in the list view.</p></li>
 <li class="listitem"><p role="presentation">Encrypted emails are marked with the Encrypted icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.encrypted"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
 <p role="presentation">If a vacation notice is enabled, a notification will be displayed above the list view.</p>
@@ -55,7 +55,7 @@
 <p> To adjust the list view layout, you have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Use the entries below <span class="guibutton"><strong>List options</strong></span> in the <span class="guibutton"><strong>Settings</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Here you can define whether checkboxes for selecting emails should be displayed.</p></li>
-<li class="listitem"><p role="presentation">Use the entries below <span class="guibutton"><strong>Message list options</strong></span> in the email settings.</p></li>
+<li class="listitem"><p role="presentation">Use the entries in the <span class="guibutton"><strong>Reading</strong></span> section of the email settings.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.list"></p>
 <p class="title">General description of the user interface:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
index e2b4ad6dade4b68d0f83f2e42bc218d2e128bf5d..0464404a81201ef74d9a1e3f1fb0f79aa9bf6f37 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.settingsmenu.html
@@ -39,8 +39,9 @@
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Layout</strong></span>. Defines the layout of the list view and the detail view in the display area.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>List options</strong></span>. Defines whether contact images, checkboxes or none of these elements will be displayed in the list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.8.6.3.3.5"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Browse categories</strong></span>. Shows all objects that have been marked with a specific category.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add mail account</strong></span>. Opens a window for adding additional email accounts.</p></li>
-<li class="listitem cap-infostore" id="id-1.7.8.6.3.3.6"><p role="presentation"><span class="guibutton"><strong>All attachments</strong></span>. Shows all email attachments that you have sent or received, in the <span class="phrase">Drive</span> app.</p></li>
+<li class="listitem cap-infostore" id="id-1.7.8.6.3.3.7"><p role="presentation"><span class="guibutton"><strong>All attachments</strong></span>. Shows all email attachments that you have sent or received, in the <span class="phrase">Drive</span> app.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Inbox tabs</strong></span>. Opens the window for configuring the inbox tabs bar.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Vacation notice</strong></span>. Opens the window for activating and configuring a vacation notice.</p></li>
@@ -53,6 +54,7 @@
 <p class="title">Instructions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html">Email Settings</a></p>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in <span class="phrase">Drive</span></a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
index b568ded6dbbcba52456bf69a0512de4f1f40002a..58c166447897b46b45bbe801f17c6391ef4bc745 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
@@ -61,7 +61,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation" class="feat-io-ox-core-openai"><a class="xref" href="ox.appsuite.user.sect.email.openai.reply.html">Using AI functions when replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a></p>
-<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html
index a3e32a10a1f62801fb701b0e7f22749c853f9cb2..ff4ca795d5002797c9451630786211c842d8c43e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.categories.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Default to using PGP inline for new mails</title>
+<title>Organizing emails with categories</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,13 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.categories">
-<div class="titlepage"><div><div><h3 class="title">Default to using PGP inline for new mails</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">Organizing emails with categories</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.11.2"></a><a class="indexterm" name="id-1.7.15.11.3"></a><p id="ox.appsuite.user.concept.email.manage.categories">To organize emails independently from folders, you can use categories. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can mark emails with categories.</p></li>
 <li class="listitem"><p role="presentation">You can view all emails that have been marked with a specific category.</p></li>
 </ul>
-<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>.</p>
 <p id="ox.appsuite.user.tip.email.manage.categories">Independently from categories, you can use inbox categories. With inbox categories, you can organize emails related to senders, see <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a>.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.categories.mark">
 <p class="title">How to mark emails with a category:</p>
@@ -63,20 +63,25 @@
 <li class="listitem"><p role="presentation">For each email, the folder containing the email will be displayed.</p></li>
 <li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
 </ul>
-          <p>Tip: As an alternative you can use the search.</p>
+          <p>Options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can also search for emails with a specific category.</p></li>
+<li class="listitem"><p role="presentation">To show all objects that have been marked with a specific category, you can browse the categories.</p></li>
+</ul>
         </div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.categories"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p>
-<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p>
+<p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
index 9ed1ffb8e6321671e4b8386440b6d5a921f46b28..dd6965df8e3792527dce02d2547f3cecf2ca9ad1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.collectaddress.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.manage.mark.html" title="Marking emails as read or unread">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Default to using PGP inline for new mails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.categories.html" title="Organizing emails with categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -35,7 +35,7 @@
 <div class="titlepage"><div><div><h3 class="title">Collecting addresses</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.10.2"></a><a class="indexterm" name="id-1.7.15.10.3"></a><p id="ox.appsuite.user.concept.email.manage.collectaddress">You have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Automatically collect new email addresses when sending or reading emails by activating this function in the advanced email settings.</p></li>
+<li class="listitem"><p role="presentation">Automatically collect new email addresses when sending or reading emails by activating this function in the <span class="guibutton"><strong>Advanced settings</strong></span> section of the email settings .</p></li>
 <li class="listitem"><p role="presentation">Manually adding email addresses to an address book</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.email.manage.collectaddress">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
index 502ca482ace293de30b40ed42a30a6b1487ad8bb..cb06a309cbf97aa54dcc1dd5ada0746048475b45 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
@@ -38,7 +38,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.movecopy.html">Moving or copying emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.mark.html">Marking emails as read or unread</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.collectaddress.html">Collecting addresses</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.7.15.4.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.source.html">Showing the email source</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></p></li>
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 eaeccf9444faab0c688df2ef50c3aa8845cf246e..1f48f99004d96725b287e9854dd1caed81127ec2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.inboxcategories.html
@@ -39,13 +39,13 @@
 <li class="listitem"><p role="presentation">assign incoming emails to an inbox category</p></li>
 <li class="listitem"><p role="presentation">edit the inbox categories view</p></li>
 </ul>
-<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails. Depending on the configuration, you can use separate categories for emails, appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a>.</p>
+<p role="presentation" class="feat-io-ox-core-categories">Note: The inbox categories described here can only be used for emails. Depending on the configuration, you can use separate categories for emails, appointments, contacts and tasks, see <a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a>.</p>
 <div class="task help-hide-inline" id="ox.appsuite.user.task.email.manage.inboxcategories.activate">
 <p class="title">How to enable or disable the inbox tabs:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <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>Configure 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 in the <span class="guibutton"><strong>Reading</strong></span> section of 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">Below the menu bar, the inbox categories bar will be displayed.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
index 5fb0f6944eb6100ef18bf0d3c34e8047c25d806d..f7e86a02a268bfdb3ac81ec40f97847ac132de87 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Default to using PGP inline for new mails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.categories.html" title="Organizing emails with categories">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.source.html" title="Showing the email source">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.mark.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.mark.html
index 8322e5a374611d2e5556bcf21f42b62c67509aef..b9ad111478577daa4e7c6bd116d6bd4d804eb7fb 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.mark.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.mark.html
@@ -38,7 +38,7 @@
 <li class="listitem"><p role="presentation">mark single emails as read or unread</p></li>
 <li class="listitem"><p role="presentation">mark all emails of an email folder as read</p></li>
 </ul>
-<p id="ox.appsuite.user.hint.email.manage.mark">Note: An unread email will be marked as read by default as soon as selecting this email. You can change this behavior in the email settings.</p>
+<p id="ox.appsuite.user.hint.email.manage.mark">Note: An unread email will be marked as read by default as soon as selecting this email. You can change this behavior in the <span class="guibutton"><strong>Reading</strong></span> section of the email settings.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.mark">
 <p class="title">How to mark an email as unread or read:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
index c244cae6ec1140f518be90cd62aaee082ce83e9a..1e8bde06b6c382da8d22f2279339e6dbd6955987 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.openai.html
@@ -40,7 +40,7 @@
 <p> Note: When using the AI integration, the content of the respective email will be sent to an OpenAI service. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The first time you use an AI function, a dialog box opens where you can agree to send this data. You can only use AI functions after having agreed to the data being sent.</p></li>
-<li class="listitem"><p role="presentation">You can change your consent to send the data at any time. To do so, click on <span class="guibutton"><strong>Change consent</strong></span> below <span class="guibutton"><strong>AI integration</strong></span> in the email settings.</p></li>
+<li class="listitem"><p role="presentation">You can change your consent to send the data at any time. To do so, click on <span class="guibutton"><strong>Change consent</strong></span> in the <span class="guibutton"><strong>AI integration</strong></span> section of the email settings.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.email.openai">You have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.search.html b/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
index 51546c138766e0f1e5d12b5d8996faa7b97e56d3..35357dcd5944e5399174509b92eea79c03545fa5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.search.html
@@ -97,7 +97,7 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.email.search">Parent topic: <a class="xref" href="ox.appsuite.user.chap.email.html"><i><span class="phrase">Email</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
index f98cb3eaae68240ee5c422c923b1c4d2d48aadd5..defa82c04cb2315dc4574b01bcfc54bd02bee033 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
@@ -49,22 +49,23 @@
 <li class="listitem"><p role="presentation">If the recipients are not to see who gets a copy of the email, enter the recipients in  the <span class="guibutton"><strong>BCC</strong></span> field.</p></li>
 </ul></p></li>
 <li class="step"><p role="presentation">Enter a subject. Enter the email text.</p></li>
-<li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Send</strong></span>.</p>
-<p role="presentation" class="feat-io-ox-core-undoSend">Tip: Depending on the configuration, you can recall the sending of an email within a short time frame. To do so, click on <span class="guibutton"><strong>Undo</strong></span> next to <span class="guibutton"><strong>Send</strong></span> in the display area. You can configure this behavior in the email settings.</p>
-</li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Send</strong></span>.</p></li>
 </ol></div>
 </div>
+<p role="presentation" class="feat-io-ox-core-undoSend">Tip: <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation">Depending on the configuration, you can recall the sending of an email within a short time frame. To do so, click on <span class="guibutton"><strong>Undo</strong></span> next to <span class="guibutton"><strong>Send</strong></span> in the display area.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Compose &amp; Reply</strong></span> section of the email settings, you can configure this behavior.</p>
+</li></ul></p>
 <p id="ox.appsuite.user.options.email.send.new">Options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">With drag and drop you can move the recipients between the fields <span class="guibutton"><strong>To</strong></span>, <span class="guibutton"><strong>CC</strong></span> and <span class="guibutton"><strong>BCC</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">In the email settings, you can determine that each outgoing email will also be sent as blind copy to a specific email address.</p></li>
+<li class="listitem"><p role="presentation">In the <span class="guibutton"><strong>Advanced settings</strong></span> section of the email settings, you can determine that each outgoing email will also be sent as blind copy to a specific email address.</p></li>
 <li class="listitem">
 <p role="presentation">To format the email text or to enter images, use the formatting bar below the text. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation">If the formatting bar is not displayed, click the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.edit"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the button bar. Enable <span class="guibutton"><strong>HTML</strong></span>. Enable the <span class="guibutton"><strong>Show toolbar</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.format"><object type="image/svg+xml" data="../../images/fonts.svg" height="15"></object></span> in the button bar.</p>
-<p role="presentation">You can define default values for the font style, size and color in the email settings.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Compose &amp; Reply</strong></span> section of the email settings, you can define default values for the font style, size and color.</p>
 </li>
 <li class="listitem">
 <p role="presentation">To enter images at the current cursor position, drag one or several images from a file browser or from the desktop to the email text input field.</p>
@@ -100,7 +101,7 @@
 </li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.7.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem feat-io-ox-core-openai" id="id-1.7.11.5.8.3.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.openai.send.html">Using AI functions when composing emails</a></p></li></ul>
 <p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
index 757220c1681b077b70ee01948b0ac613345c4fe7..b3c64a8087932b06cc22e0086babf473d8794853 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
@@ -46,7 +46,7 @@
 <li class="step feat-io-ox-mail-editRealNames">
 <p role="presentation">Depending on the configuration, you can define the name to be displayed with your email addresses. To do so, proceed as follows:</p>
 <ol type="a" class="substeps">
-<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Edit name</strong></span>. The <span class="guilabel"><strong>Edit real names</strong></span> window opens. The window displays the names that are preset in the account settings.</p></li>
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Edit name</strong></span>. The <span class="guilabel"><strong>Edit real names</strong></span> window opens. It displays the names that are preset in the <span class="guibutton"><strong>Your Accounts</strong></span> section of the Accounts settings.</p></li>
 <li class="step"><p role="presentation">Enable the checkbox of the name that you want to edit. Edit the name. Click on <span class="guibutton"><strong>Save</strong></span>.</p></li>
 </ol>
 </li>
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 d1e96df2c7cc2dcc3bbd6c1a6ecd7c05a4d356d7..5458c11edf76356a7ca5ffa53990712642679bf2 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
@@ -44,7 +44,7 @@
 <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.email.send.vacationnotice.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Vacation notice</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>Vacation notice</strong></span> button below <span class="guibutton"><strong>Rules</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>Vacation notice</strong></span> button in the <span class="guibutton"><strong>Rules</strong></span> section of the email settings.</p></li></ul>
 <p role="presentation">The <span class="guilabel"><strong>Vacation notice</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Enable the <span class="guibutton"><strong>Vacation notice</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.vacationnotice"><object type="image/svg+xml" data="../../images/toggle-off.svg" height="15"></object></span>.</p></li>
@@ -60,12 +60,12 @@
 </ul></p></li>
 </ol></div>
 <div class="taskrelated">
-          <p>The vacation notice will be entered as email filter. You can also edit the vacation notice in the email filter settings.</p>
+          <p>The vacation notice will be entered as email filter. You can also edit the vacation notice in the <span class="guibutton"><strong>Rules</strong></span> section of the email settings.</p>
         </div>
 </div>
 <p id="ox.appsuite.user.result.email.send.vacationnotice">If a vacation notice is active, the following is displayed: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">On the email settings page, the <span class="guibutton"><strong>Vacation notice</strong></span> button is marked with an additional icon.</p></li>
+<li class="listitem"><p role="presentation">In the <span class="guibutton"><strong>Rules</strong></span> section of the email settings, the <span class="guibutton"><strong>Vacation notice</strong></span> button includes an additional icon.</p></li>
 <li class="listitem"><p role="presentation">In the <span class="phrase">Email</span> app, a notification will be displayed above the list view. If clicking on the notification, the <span class="guilabel"><strong>Vacation notice</strong></span> window opens.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.send.vacationnotice"></p>
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 a2ba5083f882a1ce2982f5429dffe3b67fb86701..7ff6edb0572c42228ca90f58d4fd3aa7add4b0f1 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
@@ -43,55 +43,56 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.email.settings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.email.settings">The settings can be found in the following sections: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.layout">Layout</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.reading">Reading</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.inboxcategories">inbox categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.signatures">Signature</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.composereply">Compose &amp; Reply</a></p></li>
-<li class="listitem feat-io-ox-core-templates" id="id-1.7.21.5.1.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Templates</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.aliases">Email aliases</a></p></li>
+<li class="listitem feat-io-ox-core-templates" id="id-1.7.21.5.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.templates">Templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.rules">Rules</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.openai">AI integration</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.folders">Folder</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.html#ox.appsuite.user.reference.email.settings.advanced">Advanced settings</a></p></li>
 </ul>
 <p> Also see: <a class="xref" href="ox.appsuite.user.sect.settings.search.html">Searching for Settings</a></p>
+<p id="ox.appsuite.user.reference.email.settings.layout"></p>
+<h3 class="title">Layout</h3>
+<p><a class="indexterm" name="id-1.7.21.6.2"></a>Defines the layout of the list view and the detail view in the display area.</p>
 <p id="ox.appsuite.user.reference.email.settings.reading"></p>
 <h3 class="title">Reading</h3>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.preview"><b>Layout. </b><a class="indexterm" name="id-1.7.21.6.2.1.1.1.2"></a>Defines the layout of the list view and the detail view in the display area.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.messagelist"><b>Message list. </b><a class="indexterm" name="id-1.7.21.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.7.21.7.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.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.7.21.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 feat-io-ox-core-categories" id="id-1.7.21.6.2.1.2.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Show categories. </b><a class="indexterm" name="id-1.7.21.6.2.1.2.1.3.1.3.1.2"></a>Defines whether the categories assigned to the email will be displayed in the email list view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Always show full date and time. </b><a class="indexterm" name="id-1.7.21.6.2.1.2.1.3.1.4.1.2"></a>Defines whether not only the date of receipt but also the time of receipt will be displayed in the email list view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>show message size. </b><a class="indexterm" name="id-1.7.21.6.2.1.2.1.3.1.5.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.list"><b>simple, contact pictures, checkboxes. </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.7.21.7.2.1.1.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 feat-io-ox-core-categories" id="id-1.7.21.7.2.1.1.1.3.1.3"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.categories"><b>Show categories. </b><a class="indexterm" name="id-1.7.21.7.2.1.1.1.3.1.3.1.2"></a>Defines whether the categories assigned to the email will be displayed in the email list view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.datetime"><b>Always show full date and time. </b><a class="indexterm" name="id-1.7.21.7.2.1.1.1.3.1.4.1.2"></a>Defines whether not only the date of receipt but also the time of receipt will be displayed in the email list view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.messagelist.size"><b>show message size. </b><a class="indexterm" name="id-1.7.21.7.2.1.1.1.3.1.5.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.7.21.6.2.1.3.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.reading.readingpane"><b>Reading pane. </b><a class="indexterm" name="id-1.7.21.7.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.readingpane.quoting"><b>Show quoted text in different color. </b><a class="indexterm" name="id-1.7.21.6.2.1.3.1.3.1.1.1.2"></a>Specifies whether original messages are highlighted and introduced with a vertical line. This option assumes that the original mail text is not attached but appended to the email.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Use fixed-width font for plain text mails. </b><a class="indexterm" name="id-1.7.21.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.7.21.7.2.1.2.1.3.1.1.1.2"></a>Specifies whether original messages are highlighted and introduced with a vertical line. This option assumes that the original mail text is not attached but appended to the email.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.readingpane.fixedfont"><b>Use fixed-width font for plain text mails. </b><a class="indexterm" name="id-1.7.21.7.2.1.2.1.3.1.2.1.2"></a>Specifies whether a fixed-width font is used when displaying a plain text email.</p></li>
 </ul>
 </li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Mark as read. </b><a class="indexterm" name="id-1.7.21.6.2.1.4.1.2"></a><a class="indexterm" name="id-1.7.21.6.2.1.4.1.3"></a>Defines the period after which an email will be automatically marked as read when selecting the email. </p>
+<p id="ox.appsuite.user.reference.email.settings.reading.markasread"><b>Mark as read. </b><a class="indexterm" name="id-1.7.21.7.2.1.3.1.2"></a><a class="indexterm" name="id-1.7.21.7.2.1.3.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>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.reading.markasread.never"><b>Never. </b>The email will not automatically be marked as read.</p></li>
 </ul>
 </li>
-<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 “Unseen” that lists all unread messages. </b><a class="indexterm" name="id-1.7.21.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.7.21.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>
 </ul>
+<p id="ox.appsuite.user.reference.email.settings.inboxcategories"></p>
+<h3 class="title">inbox categories</h3>
+<p>See <a class="xref" href="ox.appsuite.user.sect.email.manage.inboxcategories.html">Working with inbox categories</a></p>
 <p id="ox.appsuite.user.reference.email.settings.signatures"></p>
 <h3 class="title">Signature</h3>
 <p>See <a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
@@ -99,31 +100,31 @@
 <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.7.21.8.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.format"><b>Message format. </b><a class="indexterm" name="id-1.7.21.10.2.1.1.1.2"></a>Defines the format in which emails are sent: </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>Message format. </b><a class="indexterm" name="id-1.7.21.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>
 <li class="listitem"><p><b>HTML and plain text. </b>The email will be sent with html markup and additionally as plain text.</p></li>
 </ul>
 </li>
-</ul>
-</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.7.21.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.7.21.10.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.7.21.8.2.1.3.1.2"></a>Defines whether emails will be sent immediately or with a short delay. </p>
+<p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend"><b>Undo send. </b><a class="indexterm" name="id-1.7.21.10.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; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend.immediately"><b>Without delay. </b>The email will be sent immediately. You can not undo the sending of the email.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.composereply.compose.undosend.seconds"><b>5 seconds, 10 seconds. </b>The email will be sent with the delay selected. You can undo the sending of the email within this time frame.</p></li>
 </ul>
 </div></li>
 </ul>
+<p id="ox.appsuite.user.reference.email.settings.openai"></p>
+<h3 class="title">AI integration</h3>
+<p>See <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
+<p id="ox.appsuite.user.reference.email.settings.aliases"></p>
+<h3 class="title">Email aliases</h3>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<p id="ox.appsuite.user.reference.email.settings.aliases.sender"><b>Email aliases. </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 <span class="guibutton"><strong>Your Accounts</strong></span> section of the Accounts settings, this name overwrites the preset sender name.</p>
+</li></ul>
 <div id="ox.appsuite.user.reference.email.settings.templates" class="feat-io-ox-core-templates">
 <p id="ox.appsuite.user.reference.email.settings.templates"></p>
 <h3 class="title">Templates</h3>
@@ -136,35 +137,52 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.rules.vacationnotice"><b>Vacation notice. </b>See <a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.rules.autoforward"><b>Auto forward. </b>See <a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p></li>
 </ul>
-<p id="ox.appsuite.user.reference.email.settings.openai"></p>
-<h3 class="title">AI integration</h3>
-<p>See <a class="xref" href="ox.appsuite.user.sect.email.openai.html">Using the AI Integration</a></p>
+<p id="ox.appsuite.user.reference.email.settings.folders"></p>
+<h3 class="title">Folder</h3>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.folders.unreadfolder"><b>Show folder “Unseen” that lists all unread messages. </b><a class="indexterm" name="id-1.7.21.15.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.folders.markedfolder"><b>Show folder “Flagged” that lists all flagged messages. </b><a class="indexterm" name="id-1.7.21.15.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.folders.imapfolders"><b>Change IMAP subscriptions. </b>See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a></p></li>
+</ul>
 <p id="ox.appsuite.user.reference.email.settings.advanced"></p>
 <h3 class="title">Advanced settings</h3>
-<ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.html"><b>Allow displaying HTML formatted emails. </b><a class="indexterm" name="id-1.7.21.12.2.1.1.1.2"></a>Specifies whether or not displaying HTML messages is allowed.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.deliveryreceipt"><b>Show requests for read receipts. </b><a class="indexterm" name="id-1.7.21.12.2.1.2.1.2"></a>Defines whether a return receipt is displayed if a received email includes receipt confirmation request.</p></li>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<p id="ox.appsuite.user.reference.email.settings.advanced.behavior"><b>Behavior. </b></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.behavior.deliveryreceipt"><b>Show requests for read receipts. </b><a class="indexterm" name="id-1.7.21.16.2.1.1.1.2.1.1.1.2"></a>Defines whether a return receipt is displayed if a received email includes receipt confirmation request.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.delete"><b>Permanently remove deleted emails. </b><a class="indexterm" name="id-1.7.21.12.2.1.3.1.2"></a>Defines whether deleted emails will be removed permanently or whether they will go to the trash folder.</p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.behavior.delete"><b>Permanently remove deleted emails. </b><a class="indexterm" name="id-1.7.21.16.2.1.1.1.2.1.2.1.2"></a>Defines whether deleted emails will be removed permanently or whether they will go to the trash folder.</p>
 <p role="presentation"><span class="phrase"><strong>Warning:</strong></span> Depending on the configuration, permanently deleted emails can <span class="bold">not</span> be recovered.</p>
 <p role="presentation">See <a class="xref" href="ox.appsuite.user.sect.email.remove.delete.html">Deleting emails</a></p>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.selectrecent"><b>Select newest read message automatically at start. </b><a class="indexterm" name="id-1.7.21.12.2.1.4.1.2"></a>Defines whether the most recent read message will be selected automatically when starting the app.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.collectsend"><b>Automatically collect contacts in the "Collected addresses" folder while sending emails. </b><a class="indexterm" name="id-1.7.21.12.2.1.5.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected addresses</strong></span> folder when sending a new email.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.collectread"><b>Automatically collect contacts in the "Collected addresses" folder while reading emails. </b><a class="indexterm" name="id-1.7.21.12.2.1.6.1.2"></a>Defines whether new email addresses are automatically collected in the <span class="guibutton"><strong>Collected addresses</strong></span> folder when reading a new email.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailto"><b>Ask for mailto link registration. </b><a class="indexterm" name="id-1.7.21.12.2.1.7.1.2"></a>Defines whether the groupware can ask for a mailto link registration.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.quote"><b>Insert the original email text to a reply. </b><a class="indexterm" name="id-1.7.21.12.2.1.8.1.2"></a>Specifies whether the original email text is appended to an email reply.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.mailinglist"><b>Ask before replying to a mailing list. </b><a class="indexterm" name="id-1.7.21.12.2.1.9.1.2"></a>Defines whether you have to confirm the recipient when replying to a mailing list.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.appendvcard"><b>Always attach my detailed contact data as vCard. </b><a class="indexterm" name="id-1.7.21.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.behavior.selectrecent"><b>Select newest read message automatically at start. </b><a class="indexterm" name="id-1.7.21.16.2.1.1.1.2.1.3.1.2"></a>Defines whether the most recent read message will be selected automatically when starting the app.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.behavior.mailto"><b>Ask for mailto link registration. </b><a class="indexterm" name="id-1.7.21.16.2.1.1.1.2.1.4.1.2"></a>Defines whether the groupware can ask for a mailto link registration.</p></li>
+</ul>
+</li></ul>
+<p> </p>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem">
+<p id="ox.appsuite.user.reference.email.settings.advanced.reading"><b>Reading. </b></p>
+<ul class="itemizedlist" style="list-style-type: circle; "><li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.reading.html"><b>Allow displaying HTML formatted emails. </b><a class="indexterm" name="id-1.7.21.16.2.2.1.1.2.1.1.1.2"></a>Specifies whether or not displaying HTML messages is allowed.</p></li></ul>
+</li></ul>
+<p> </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.collect"><b>Automatic email address collection. </b><a class="indexterm" name="id-1.7.21.16.2.3.1.1.2"></a>Defines whether new email addresses are automatically added as new contacts in the <span class="guibutton"><strong>Collected addresses</strong></span> folder when sending or reading a new email.</p></li>
 <li class="listitem">
-<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Forward emails as. </b><a class="indexterm" name="id-1.7.21.12.2.1.11.1.2"></a>Specifies how an email text is sent when forwarding the email. </p>
+<p id="ox.appsuite.user.reference.email.settings.advanced.forward"><b>Forward emails as. </b><a class="indexterm" name="id-1.7.21.16.2.3.2.1.2"></a>Specifies how an email text is sent when forwarding the email. </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p><b>Inline. </b>The text is sent within the new email text.</p></li>
 <li class="listitem"><p><b>Attachment. </b>The text is sent as attachment to the new email.</p></li>
 </ul>
 </li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.alwaysbcc"><b>Always add the following recipient to blind carbon copy (BCC). </b><a class="indexterm" name="id-1.7.21.12.2.1.12.1.2"></a>To send each outgoing email as blind copy (BCC) to an email address, enter the wanted email address in this field.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.imapfolders"><b>Change IMAP subscriptions. </b>See <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a></p></li>
+<li class="listitem">
+<p id="ox.appsuite.user.reference.email.settings.advanced.composereply"><b>Compose &amp; Reply. </b></p>
+<ul class="itemizedlist" style="list-style-type: circle; ">
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.composereply.quote"><b>Insert the original email text to a reply. </b><a class="indexterm" name="id-1.7.21.16.2.3.3.1.2.1.1.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.composereply.mailinglist"><b>Ask before replying to a mailing list. </b><a class="indexterm" name="id-1.7.21.16.2.3.3.1.2.1.2.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.composereply.appendvcard"><b>Always attach my detailed contact data as vCard. </b><a class="indexterm" name="id-1.7.21.16.2.3.3.1.2.1.3.1.2"></a>Specifies whether your contact data will be attached to a new email in the vCard format.</p></li>
+</ul>
+</li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.advanced.alwaysbcc"><b>Always add to BCC. </b><a class="indexterm" name="id-1.7.21.16.2.3.4.1.2"></a>To send each outgoing email as blind copy (BCC) to an email address, enter the wanted email address in this field.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.settings"></p>
 <p class="title">User interface:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.view.html b/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
index 678880ecb9b775470dd03ee8bb74dec1575a78d2..ed2d94bb048f5e5ed18fb817d408c75b95a5f96f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.view.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.view">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Viewing Emails</h2></div></div></div>
-<a class="indexterm" name="id-1.7.9.2"></a><a class="indexterm" name="id-1.7.9.3"></a><p id="ox.appsuite.user.orientation.email.view">Learn how to select a specific email in a folder and display it in different ways in order to read it. An unread email will be marked as read by default as soon as selecting this email. You can change this behavior in the email settings.</p>
+<a class="indexterm" name="id-1.7.9.2"></a><a class="indexterm" name="id-1.7.9.3"></a><p id="ox.appsuite.user.orientation.email.view">Learn how to select a specific email in a folder and display it in different ways in order to read it. An unread email will be marked as read by default as soon as selecting this email. You can change this behavior in the <span class="guibutton"><strong>Reading</strong></span> section of the email settings.</p>
 <div class="task" id="ox.appsuite.user.task.email.view">
 <p class="title">How to display an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -56,7 +56,7 @@
 <p id="ox.appsuite.user.options.email.view">Options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">In the security settings, you can determine whether external images are loaded, see <a class="xref" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>.</p>
+<p role="presentation">In the <span class="guibutton"><strong>External images in emails</strong></span> section of the security settings, you can define whether external images should be loaded.</p>
 <p role="presentation">Depending on the setting, you can view external images by clicking on <span class="guibutton"><strong>Show images</strong></span>.</p>
 <p role="presentation">If you want external images to always be displayed in emails from the sender of the current email, click on <span class="guibutton"><strong>Always show images from (this sender)</strong></span>.</p>
 </li>
@@ -69,7 +69,7 @@
 <li class="listitem"><p role="presentation">You can open the email in a window by double-clicking on the email in the list view.</p></li>
 <li class="listitem"><p role="presentation">When having selected the <span class="guibutton"><strong>List</strong></span> layout in the <span class="guibutton"><strong>Settings</strong></span><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.options.email.view.settings.list"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>, a list of all emails in the folder will be shown in the display area. If clicking on an email, the email's detail view will be displayed.</p></li>
 </ul>
-<p id="ox.appsuite.user.tip.email.view">Tip: In the email settings, you can define whether a notification sound is to be played for incoming emails.</p>
+<p id="ox.appsuite.user.tip.email.view">Tip: In the  <span class="guibutton"><strong>Email</strong></span> section of the notification settings, you can define whether a notification sound is to be played for incoming emails.</p>
 <p id="ox.appsuite.user.related.email.view"></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.firststeps.changepassword.html b/help/l10n/en_US/ox.appsuite.user.sect.firststeps.changepassword.html
index 7ee69689bcd21dd6dd6ed5929d516b7b6aec5cd6..15d1bd07b320e97032671ff395e3f533d8233a01 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
@@ -35,11 +35,11 @@
 <a class="indexterm" name="id-1.3.6.2"></a><a class="indexterm" name="id-1.3.6.3"></a><p id="ox.appsuite.user.hint.firststeps.changepassword">Note: Depending on the configuration, the steps for changing the password might differ from this instruction. In this case, contact your administrator or host.</p>
 <p id="ox.appsuite.user.concept.firststeps.changepassword">Depending on the configuration, you have the following options for changing the password: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">use the basic settings</p></li>
+<li class="listitem"><p role="presentation">use the settings</p></li>
 <li class="listitem"><p role="presentation">use the <span class="guilabel"><strong>User data</strong></span> widget</p></li>
 </ul>
 <div class="task" id="ox.appsuite.user.task.firststeps.changepassword.settings">
-<p class="title">How to change your password in the basic settings:</p>
+<p class="title">How to change your password in the 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.firststeps.changepassword.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>
@@ -47,7 +47,7 @@
 </li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Change password</strong></span> below <span class="guibutton"><strong>Advanced settings</strong></span></p>
+<p role="presentation">In <span class="guibutton"><strong>Advanced settings</strong></span>, click on <span class="guibutton"><strong>Change password</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Change your password.</p></li>
 </ol></div>
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 d176c5a4ad0076d29f217cfcb026194695af16c9..078f7fde0340816ac450008c745511d4aa97c53e 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
@@ -47,6 +47,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.popup.html">The pop-up</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.notificationarea.html">The notification area</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.create.html">The editing window</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Using browser buttons</a></p></li>
 </ul>
 <p role="presentation" class="feat-io-ox-core-navigation">For certain actions you have the following additional option: <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.firststeps.gui.browserbuttons.html">Using browser buttons</a></p></li></ul></p>
 <p id="ox.appsuite.user.parent.firststeps.gui">Parent topic: <a class="xref" href="ox.appsuite.user.chap.firststeps.html"><i>First Steps</i></a></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 8b41455bb429f8b24493d17db49846387d5eea09..2943643f2ea19fe24f72cafed3d81884a4fe11b3 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
@@ -62,7 +62,7 @@
 <p role="presentation">Overdue tasks</p>
 <p role="presentation">Next to <span class="guibutton"><strong>Overdue tasks</strong></span>, the number of overdue tasks will be displayed.</p>
 </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">In <span class="guibutton"><strong>Information area</strong></span> in the notification 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">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>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.importkey.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.importkey.html
index 90f0423f65e7b9c66cffd41dca489d521f796ee1..73a64f33f2a77f3bdd466411a65b9ed36b790d49 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.importkey.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.importkey.html
@@ -34,7 +34,7 @@
 <h2 class="sr-only">Encrypting Email Conversations with Autocrypt</h2>
 <div class="sect2" id="ox.appsuite.user.sect.guard.autocrypt.importkey">
 <div class="titlepage"><div><div><h3 class="title">Importing Autocrypt keys</h3></div></div></div>
-<a class="indexterm" name="id-1.14.8.7.2"></a><a class="indexterm" name="id-1.14.8.7.3"></a><a class="indexterm" name="id-1.14.8.7.4"></a><p id="ox.appsuite.user.concept.guard.autocrypt.importkey">In the advanced <span class="phrase">Guard</span> settings, you can define whether Autocrypt keys are automatically imported. You can set the following: </p>
+<a class="indexterm" name="id-1.14.8.7.2"></a><a class="indexterm" name="id-1.14.8.7.3"></a><a class="indexterm" name="id-1.14.8.7.4"></a><p id="ox.appsuite.user.concept.guard.autocrypt.importkey">In the <span class="guibutton"><strong>Advanced</strong></span> section of the Guard settings, you can define whether Autocrypt keys are automatically imported. You can set the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">All Autocrypt keys received are automatically imported.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.manage.html
index 4bab61e849bf6cfbfed343e8166d41ec8f354bba..8879dd1d75cfd583eba250111c93798cb2b758d9 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.autocrypt.manage.html
@@ -78,7 +78,7 @@
 <p id="ox.appsuite.user.related.guard.autocrypt.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.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.importkey.html">Importing Autocrypt keys</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.autocrypt.clients.html">Transferring Autocrypt keys to other clients</a></p>
 </li></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.createencrypted.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.createencrypted.html
index 14f68efd00af903f4a168055d070eb014f89aaed..88077746835327e372bff4813aaee9f98cfd9de3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.createencrypted.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.createencrypted.html
@@ -50,7 +50,7 @@
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
 <p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 </ol></div>
 </div>
@@ -61,7 +61,7 @@
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
 <p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Unnamed</strong></span> in the menu bar. Enter a name.</p></li>
 </ol></div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.open.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.open.html
index c3f8fd893796abb04ff556bbf03cf2ea4ec89d1f..5335ac2be869aef05e96bf3e0df6ec2ea4db298a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.open.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.open.html
@@ -48,7 +48,7 @@
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
 <p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 <li class="step"><p role="presentation">You can use the following functions: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Edit the document. Information can be found in the <span class="phrase">Documents</span> user guide.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.saveencrypted.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.saveencrypted.html
index 38e8b20d411cb4ed056bd33133f350286894d42d..f643a03760481ce8cc327730394c06dca438f09c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.saveencrypted.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.documents.saveencrypted.html
@@ -46,7 +46,7 @@
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
 <p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.decrypt.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.decrypt.html
index 1ed6000f8869200a6b6cb4d4d9014a9b02d6df22..96c2a7924068057a4ba5680df9a7f4a91a1d5121 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.decrypt.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.decrypt.html
@@ -45,8 +45,8 @@
 </ul></p></li>
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
-<p role="presentation">You can define how long the <span class="phrase">Guard</span> security password should be valid. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, select a time range in <span class="guibutton"><strong>Ask for password again</strong></span>.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.download.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.download.html
index d5a841bfcb8e0e865776475977652b0bb7642267..f228e7d657f31384189b29d736f024897d691667 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.download.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.download.html
@@ -41,8 +41,8 @@
 <li class="step"><p role="presentation">In the <span class="phrase">Drive</span> app, select an encrypted file in the display area. Click the <span class="guibutton"><strong>View</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.drive.download"><object type="image/svg+xml" data="../../images/eye.svg" height="15"></object></span> in the toolbar.</p></li>
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
-<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, select a time range in <span class="guibutton"><strong>Ask for password again</strong></span>.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 <li class="step">
 <p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.guard.drive.download.viewer.more"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the Viewer. Click on <span class="guibutton"><strong>Download Decrypted</strong></span>.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.open.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.open.html
index fa79d90c050084cd33025b4ee21370504553c818..f21d00b656c2c5d683750de3f544e46660e256dd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.open.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.open.html
@@ -41,8 +41,8 @@
 <li class="step"><p role="presentation">In the <span class="phrase">Drive</span> app, select an encrypted file in the display area. Click the <span class="guibutton"><strong>View</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.drive.open"><object type="image/svg+xml" data="../../images/eye.svg" height="15"></object></span> in the toolbar.</p></li>
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password in the <span class="guilabel"><strong>Password required</strong></span> window.</p>
-<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="guibutton"><strong>Remember my password</strong></span>. Select a value from the list.</p>
-<p role="presentation">In the Guard security settings, you can <a class="link" href="ox.appsuite.user.sect.guard.settings.html">define a default value</a> for the time range.</p>
+<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, select a time range in <span class="guibutton"><strong>Ask for password again</strong></span>.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.email.read.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.email.read.html
index 8fcb25ac7996dd2c13f53089362781b229ce81b1..06f7e3e51d2c6b03926d2fc58d7bcadebe698669 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.email.read.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.email.read.html
@@ -40,16 +40,16 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Select an email with the <span class="guibutton"><strong>Encrypted</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.read"><object type="image/svg+xml" data="../../images/lock.svg" height="15"></object></span> in the list view. In the detail view, the notification <span class="guibutton"><strong>Secure Email</strong></span> will be displayed.</p>
-<p role="presentation">Click on <span class="guibutton"><strong>Read email</strong></span>.</p>
-<p role="presentation">Note: If, when having used guard the last time, you set that <span class="phrase">Guard</span> should remember the security password, the email will be displayed immediately.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Read email</strong></span>. The <span class="guilabel"><strong>Password needed</strong></span> window will be displayed.</p>
+<p role="presentation">Note: If, when having entered your security password the last time, you set that <span class="phrase">Guard</span> should remember the security password, the email will be displayed in plain text immediately.</p>
 </li>
 <li class="step">
 <p role="presentation">Enter your <span class="phrase">Guard</span> security password.</p>
-<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, enable <span class="phrase">Keep me logged into <span class="guibutton"><strong>Guard </strong></span></span>. Select a time range from the list.</p>
-<p role="presentation">In the Guard default settings, you can define a default value for the time range.</p>
+<p role="presentation">You can define how long the security password should be remembered by <span class="phrase">Guard</span>. To do so, select a time range in <span class="guibutton"><strong>Ask for password again</strong></span>.</p>
+<p role="presentation">In the <span class="guibutton"><strong>Guard Default Settings</strong></span> section of the Guard settings, you can define a default value for the time range.</p>
 </li>
 <li class="step">
-<p role="presentation">Click on <span class="guibutton"><strong>Sign in</strong></span>. The content is shown in plain text.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Confirm</strong></span>. The content is shown in plain text.</p>
 <p role="presentation">If the email includes attachments, functions for using the attachments' decrypted or encrypted versions will be displayed.</p>
 </li>
 </ol></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 933b74571b0b9dadfaf737df5bbf42688b178f53..1b67e28f3f5647c514aafbe38a28d2400777836e 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
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.email.external.html">How can external recipients read an encrypted email?</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending new emails</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.email.send">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.email.html">Encrypting Email Conversations</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.html
index f63405ec9fb21d66c041024f68507d9e9518f5e2..e66037c8f33388ee43a12aad919d4a883b918f6f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.html
@@ -52,7 +52,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.guard.password.html">Password Management</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.keys">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>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.smimepublickeys.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
index 9d530bbe992f9f030f07faea3707ec44d3623eaa..9a6e7eb9e1d1d1b5224c09e11f2a31dff6e140ee 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.keys.smimepublickeys.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.guard.keys.html" title="Key Management">
 <link rel="prev" href="ox.appsuite.user.sect.guard.keys.yoursmimekeys.html" title="Managing own S/MIME keys">
-<link rel="next" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="next" 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"> 
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 f1d9e9af430859a5e9601cf87b656cc57657e1c3..e269bb4e4a5599847f9e0c871c6dd967e08f63a6 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
@@ -44,7 +44,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.guard.keys.html">Key Management</a></p></li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> Settings</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.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>
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 dabaa0d2e3806bc82093ee83cac70cbeec86a5c4..9a354b56aaf34b2016bacc41460ed04bb5e6f7b5 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
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Guard Settings</title>
+<title>GuardSettings</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">
@@ -33,7 +33,7 @@
 </h1>
 <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>
+<span class="phrase">Guard</span>Settings</h2></div></div></div>
 <a class="indexterm" name="id-1.14.14.2"></a><a class="indexterm" name="id-1.14.14.3"></a><a class="indexterm" name="id-1.14.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">
@@ -45,7 +45,7 @@
 <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>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.guard.settings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.guard.settings">The settings can be found in the following sections: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.default"><span class="phrase">Guard</span> default settings</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html#ox.appsuite.user.reference.guard.settings.pgppasswords">Password Management (PGP)</a></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 b509511cbfbdf54aec5a4a2422ca6600092975d6..9982f1d1e5afae5f41beb7d93c936e1358f55365 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
@@ -33,7 +33,7 @@
 <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.6.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>
+<p class="title">How to use the Portal 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.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>
@@ -41,13 +41,14 @@
 <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>Portal</strong></span> in the left pane.</p></li>
-<li class="step"><p role="presentation">Change the settings.</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.portal.settings">The following settings are available:</p>
+<p id="ox.appsuite.user.reference.portal.settings">The settings can be found in the following sections: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.settings.html#ox.appsuite.user.reference.portal.settings.widgets">Portal widgets</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.portal.settings.html#ox.appsuite.user.reference.portal.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.portal.settings.widgets"></p>
 <h3 class="title">Portal widgets</h3>
 <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 4d1db83991d77df6c83320d57bd4f328bfd7e29e..65300b9e3dea01919e687c85844c91a5cc0a3fb6 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
@@ -44,11 +44,11 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Basic</strong></span> in the left pane.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.settings.commonsettings">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.settings.commonsettings">The settings can be found in the following sections: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.settings.commonsettings.html#ox.appsuite.user.reference.settings.commonsettings.theme">Theme</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.languagetimezone">Language and timezone</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.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.applauncher">Apps</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.shortcuts">Keyboard shortcuts</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>
@@ -57,11 +57,11 @@
 <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.6.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.6.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>
@@ -86,7 +86,7 @@
 <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>
+<p role="presentation"> The preset regional settings depend on the selected language. In <span class="guibutton"><strong>Preview</strong></span>, a preview of the current date and time formats will be displayed.</p>
 </li></ul>
 </li>
 <li class="listitem">
@@ -98,10 +98,10 @@
 </li>
 </ul>
 <p id="ox.appsuite.user.reference.settings.commonsettings.applauncher"></p>
-<h3 class="title">Start app &amp; Quick launch bar</h3>
+<h3 class="title">Apps</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.6.9.2.1.1.1.2"></a></p>
+<p id="ox.appsuite.user.reference.settings.commonsettings.applauncher.defaultapp"><b>Start app. </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">
@@ -121,7 +121,7 @@
 </li>
 <li class="listitem feat-io-ox-core-categories" id="id-1.4.6.11.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>
+<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">use categories</a></p></li></ul>
 </li>
 <li class="listitem cap-deputy" id="id-1.4.6.11.2.1.3">
 <p id="ox.appsuite.user.reference.settings.commonsettings.deputy"><b>Manage deputies. </b></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 4136c2a414feb0655938339501ae8745c77424de..62d87001bcaca4cd25b9ab137c38df48db460da5 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
@@ -60,7 +60,7 @@
 <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">Enable <span class="guibutton"><strong>Show countdown</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>
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 32745b6332c068faa1a66fbd7f7f5541ecd38ae2..3d15ed119fdd5bac7429488f3bfaaddbea91fb7c 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
@@ -44,11 +44,11 @@
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Notifications</strong></span> in the left pane.</p></li>
 </ol></div>
 </div>
-<p id="ox.appsuite.user.reference.settings.notifications">Depending on the configuration, the following settings are available: </p>
+<p id="ox.appsuite.user.reference.settings.notifications">The settings can be found in the following sections: </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.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.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>
@@ -69,10 +69,11 @@
 <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.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>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.notificationarea.reminderspast"><b>show reminders for past appointments. </b><a class="indexterm" name="id-1.4.7.8.2.1.3.1.2"></a>Defines whether appointment reminders are displayed for past  appointments.</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.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>
@@ -87,9 +88,9 @@
 <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.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.changes"><b>appointment invitations, changes or deletions. </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>Participants accept or decline your invitation. </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 organized by you.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.calendar.email.participant"><b>Participants accept or decline appointments. </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>
@@ -99,9 +100,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.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>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.new"><b>Task invitations, changes or deletions. </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>Participants accept or decline your invitation. </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 organized by you.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.settings.notifications.tasks.email.participant"><b>participants accept or decline tasks. </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">
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 3159ad680fa934768df8a28d4c77d9632d065512..ec44933b8378d80982feef22be9eb8bb95fea335 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
@@ -33,7 +33,7 @@
 <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.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>
+<p id="ox.appsuite.user.concept.settings.personaldata">You have the following options: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">change personal contact data</p></li>
 <li class="listitem"><p role="presentation">create a contact picture by uploading an existing picture or by taking a new photo with the device camera</p></li>
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
index 4c0dc723fd97b3bddfc7704b19e7b16571560238..3e508935da33d5ebd1efe4c001324e283cce2867 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.settings.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.settings.search.html
@@ -64,8 +64,8 @@
 <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>
-<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span> 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>
+<p role="presentation" class="cap-guard"><a class="xref" href="ox.appsuite.user.sect.guard.settings.html"><span class="phrase">Guard</span>Settings</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.settings.search">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.tasks.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.edit.html
index 254b1a84d156a2a05fe682d909a0e92d72a37b4c..d7d5d7bd2fe4764615289f75ba123b01fc9cdf96 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.edit.html
@@ -66,7 +66,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></p>
 </li>
 <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></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.12.7.3.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.12.7.3.4"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">use categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.edit">Parent topic: <a class="xref" href="ox.appsuite.user.chap.tasks.html"><i><span class="phrase">Tasks</span></i></a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.folder.subscribeshared.html
index 9f28896eddf4163cdcac9c26f56da2a57407e2c9..173b540457f3136fad5329e6611f12b779a61364 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
@@ -47,10 +47,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <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>
-<li class="listitem"><p role="presentation">You can also use the <span class="guibutton"><strong>Subscribe shared task folders</strong></span> button in the tasks settings.</p></li>
-</ul></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.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 to shared task folders</strong></span></p>
 <p role="presentation">A window opens. It shows your private, the public and shared task lists.</p>
 </li>
 <li class="step">
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 8cac17e8c23439da65ef12a3d9f251011a37c3a6..9b17759a8c3b1068be1de435712598b8d13ad943 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
@@ -38,6 +38,7 @@
 <li class="listitem"><p role="presentation">Adjust all settings</p></li>
 <li class="listitem"><p role="presentation">Select a theme for the user interface</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>List options</strong></span>. Defines whether there will be checkboxes displayed in the list view.</p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.7.6.3.3.4"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Browse categories</strong></span>. Shows all objects that have been marked with a specific category.</p></li>
 <li class="listitem"><p role="presentation">Subscribe to shared task folders</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Connect your Device</strong></span>. Launches a wizard for setting up local apps with which you can access your groupware data.</p></li>
 </ul>
@@ -47,6 +48,7 @@
 <p> </p>
 <p class="title">Instructions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation" class="feat-io-ox-core-categories"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">Subscribing to public and shared task lists</a></p>
 <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></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html
index 98e3e6f778d06ceb37240702c5b02a5f634b963a..6f2224832f0308b9a1e764e33e461178ed929475 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.categories.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Using categories for tasks</title>
+<title>organize tasks with categories</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,13 +32,13 @@
   <h1 class="sr-only"><span class="phrase">Tasks</span></h1>
 <h2 class="sr-only">Managing Tasks</h2>
 <div class="sect2" id="ox.appsuite.user.sect.tasks.manage.categories">
-<div class="titlepage"><div><div><h3 class="title">Using categories for tasks</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">organize tasks with categories</h3></div></div></div>
 <a class="indexterm" name="id-1.10.15.9.2"></a><a class="indexterm" name="id-1.10.15.9.3"></a><p id="ox.appsuite.user.concept.tasks.manage.categories">To organize tasks independently from folders, you can use categories. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">You can mark tasks with categories.</p></li>
 <li class="listitem"><p role="presentation">You can display all tasks that have been marked with a specific category.</p></li>
 </ul>
-<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a>.</p>
+<p> You can create, edit or delete own categories, see <a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a>.</p>
 <div class="task" id="ox.appsuite.user.task.tasks.manage.categories">
 <p class="title">How to mark tasks with a category:</p>
 <div class="procedure"><ol class="procedure" type="1">
@@ -64,20 +64,25 @@
 <li class="listitem"><p role="presentation">The list view shows all tasks that have been marked with this category.</p></li>
 <li class="listitem"><p role="presentation">To display the previous list, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.tasks.manage.categories.view"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p></li>
 </ul>
-          <p>Tip: As an alternative you can use the search.</p>
+          <p>Options: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">You can also search for tasks with a specific category.</p></li>
+<li class="listitem"><p role="presentation">To show all objects that have been marked with a specific category, you can browse the categories.</p></li>
+</ul>
         </div>
 </div>
 <p id="ox.appsuite.user.related.tasks.manage.categories"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.html">Managing Categories</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.manage.html">Managing Categories</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.categories.browse.html">Browsing categories</a></p>
 </li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.search.html">Searching for Tasks</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Default to using PGP inline for new mails</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Using categories for appointments</a></p>
-<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Using categories for contacts</a></p>
+<p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.manage.categories.html">Organizing emails with categories</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.categories.html">Organizing appointments with categories</a></p>
+<p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.manage.categories.html">Organizing contacts with categories</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.manage.categories">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
index 0043eb4662b40124a7acc41fb2a52812338bce3f..1ab0248f11c59ced247f38843f384397c8503ccc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.changeduedate.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
 <link rel="prev" href="ox.appsuite.user.sect.tasks.manage.markasdone.html" title="Marking tasks as done">
-<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Using categories for tasks">
+<link rel="next" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="organize tasks with categories">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
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 616534bce03efd81d14489b845005ffeb23fc074..4167ae35c9e38d5f9c74cbeaf717073f5da36d01 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.html
@@ -36,7 +36,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.markasdone.html">Marking tasks as done</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changeduedate.html">Changing a task's due date</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.15.4.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.move.html">Moving tasks to another folder</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.changestatus.html">Changing task confirmations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></p></li>
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 9ecbe2ba457a459cbdc7ac784c86f09056e464dd..fdd06cc09fa6b255e0acdc0af59e11e1599ae336 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.manage.move.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.tasks.manage.html" title="Managing Tasks">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="Using categories for tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.categories.html" title="organize tasks with categories">
 <link rel="next" href="ox.appsuite.user.sect.tasks.manage.changestatus.html" title="Changing task confirmations">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
index 409710bbac5501e9aa2a12d39636f894a8c7dc05..468d299bbcdfa67049dea64a56f4f3fbe4f71108 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.search.html
@@ -77,7 +77,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a></p></li>
-<li class="listitem feat-io-ox-core-categories" id="id-1.10.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">Using categories for tasks</a></p></li>
+<li class="listitem feat-io-ox-core-categories" id="id-1.10.17.6.1.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.categories.html">organize tasks with categories</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.tasks.search">Parent topic: <a class="xref" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a></p>
 </div>