diff --git a/help/l10n/en_US/bk01-toc.html b/help/l10n/en_US/bk01-toc.html
index 70c87b1a3be7d4c38b4bea2ed149ce5ef888e362..e973a26763b8306904baa3bf84f5880ac7907fa1 100644
--- a/help/l10n/en_US/bk01-toc.html
+++ b/help/l10n/en_US/bk01-toc.html
@@ -125,12 +125,14 @@
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></li>
 <li class="sect1 cap-webmail"><a href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></li>
 <li class="sect1 cap-webmail">
-<a href="ox.appsuite.user.sect.email.send.html">Sending Emails</a><ul>
+<a href="ox.appsuite.user.sect.email.send.html">Send emails</a><ul>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></li>
+<li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></li>
+<li class="sect2 feat-io-ox-core-templates"><a href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></li>
@@ -153,6 +155,7 @@
 <li class="sect2 cap-tasks"><a href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a></li>
 <li class="sect2 cap-portal"><a href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a></li>
+<li class="sect2 feat-io-ox-core-mailPDFExport"><a href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a></li>
 <li class="sect2 cap-webmail"><a href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a></li>
@@ -210,7 +213,7 @@
 </li>
 <li class="sect1 cap-calendar"><a href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a></li>
 <li class="sect1 cap-calendar">
-<a href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a><ul>
+<a href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.datepicker.html">Using the date picker</a></li>
 <li class="sect2 cap-calendar cap-switchboard"><a href="ox.appsuite.user.sect.calendar.add.call.html">Scheduling audio/video conferences</a></li>
@@ -221,7 +224,7 @@
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></li>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></li>
@@ -233,7 +236,7 @@
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a><ul>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a></li>
-<li class="sect2 cap-calendar_google"><a href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></li>
+<li class="sect2 cap-calendar_google"><a href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></li>
 <li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></li>
@@ -241,7 +244,7 @@
 </li>
 <li class="sect1 cap-calendar">
 <a href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a><ul>
-<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></li>
+<li class="sect2 cap-calendar"><a href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a></li>
 <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 timezones</a></li>
@@ -402,8 +405,8 @@
 </ul>
 </li>
 <li class="sect1 cap-infostore">
-<a href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a><ul>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></li>
+<a href="ox.appsuite.user.sect.drive.view.html">view files</a><ul>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></li>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></li>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in <span class="phrase">Drive</span></a></li>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a></li>
@@ -413,10 +416,10 @@
 <li class="sect1 cap-infostore">
 <a href="ox.appsuite.user.sect.drive.folder.html"><span class="phrase">Drive</span>: Adding Folders</a><ul>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: creating folders</a></li>
-<li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared <span class="phrase">Drive</span> folders</a></li>
+<li class="sect2 cap-contacts"><a href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></li>
 </ul>
 </li>
-<li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a></li>
+<li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a></li>
 <li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></li>
 <li class="sect1 cap-infostore">
 <a href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and <span class="phrase">Drive</span> Folders</a><ul>
@@ -431,7 +434,7 @@
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or <span class="phrase">Drive</span> folders to Favorites</a></li>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or <span class="phrase">Drive</span> folders</a></li>
 <li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a></li>
-<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></li>
+<li class="sect2 cap-infostore"><a href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></li>
 </ul>
 </li>
 <li class="sect1 cap-infostore"><a href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a></li>
diff --git a/help/l10n/en_US/index.html b/help/l10n/en_US/index.html
index 0c09c1bb6f919a187b0e87405ae76e5e7de1add9..dc42627284ef292b52fbab147cf029a8782ea2a1 100644
--- a/help/l10n/en_US/index.html
+++ b/help/l10n/en_US/index.html
@@ -34,7 +34,7 @@
 </h3></div></div>
 <div><p class="copyright">Copyright ©  OX Software GmbH </p></div>
 <div><a href="ox.appsuite.user.legalnotice.html">Legal Notice</a></div>
-<div><p class="pubdate">Tuesday, June 06, 2023 Version 8.14.0 </p></div>
+<div><p class="pubdate">Wednesday, July 12, 2023 Version 8.15.0 </p></div>
 <div><div class="abstract" id="ox.appsuite.user.startpage">
 <p class="title"></p>
 <h2 class="title">Help Topics Overview</h2>
@@ -65,7 +65,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">Email</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.3.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p></li>
@@ -80,7 +80,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.1.6.2.2.1.4.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
@@ -128,7 +128,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.chap.drive.html"><i><span class="phrase">Drive</span></i></a></p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">Drive</span> Components</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.download.html">Downloading Files or Folder Contents</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.html"><span class="phrase">Drive</span>: Adding Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.calendar.html b/help/l10n/en_US/ox.appsuite.user.chap.calendar.html
index e4c0889b461161c469488bc62b0651276fd45484..d02adbf15b9b091187cd93191e18c82b8c03b8d2 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.calendar.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.calendar.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.email.settings.html" title="Email Settings">
+<link rel="prev" href="ox.appsuite.user.sect.email.settings.compose.html" title="Settings for composing emails">
 <link rel="next" href="ox.appsuite.user.sect.calendar.gui.html" title="The Calendar Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.settings.compose.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.calendar.gui.html">Next</a></li>
@@ -35,7 +35,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.start">
 <p class="title">How to start the <span class="phrase">Calendar</span> app:</p>
 <div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> in the menu bar. Click on <span class="phrase"><span class="guibutton"><strong>Calendar</strong></span></span> in the App Launcher.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. Click on <span class="phrase"><span class="guibutton"><strong>Calendar</strong></span></span> in the App Launcher.</p>
 <p role="presentation">Depending on the configuration, you can also click the quick start icon in the menu bar for launching the <span class="phrase">Calendar</span> app.</p>
 </li></ul></div>
 </div>
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.html">The <span class="phrase">Calendar</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.html">Viewing Appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.7.6.1.7"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
index 622090a965ceb8d45cec281621ce9e18588c4579..18cb3ea99e8536463bfe93670824ad624766268f 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.contacts.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.settings.html" title="Calendar Settings">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.managedresources.administer.html" title="Administrating managed resources as booking delegate">
 <link rel="next" href="ox.appsuite.user.sect.contacts.gui.html" title="The Address Book Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.calendar.managedresources.administer.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.contacts.gui.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
index 043d0792c245c18342cbec2faa998a443fcba87c..b32677e530f8d117fffbe9939d67512957bd28c6 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.dataorganisation.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.drive.settings.html" title="Drive Settings">
+<link rel="prev" href="ox.appsuite.user.sect.drive.webdav.win.html" title="Setting up WebDAV under Windows">
 <link rel="next" href="ox.appsuite.user.sect.dataorganisation.folder.html" title="Managing Data with Folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.drive.webdav.win.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.dataorganisation.folder.html">Next</a></li>
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 d3bd7330b8ec17a63dfa43ce01e6dc622f7d8788..ed5f82fc11eccb80d7c88a6fa68c3ca8090deb45 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.drive.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.drive.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.tasks.manage.delete.html" title="Deleting tasks">
+<link rel="prev" href="ox.appsuite.user.sect.tasks.settings.html" title="Task Settings">
 <link rel="next" href="ox.appsuite.user.sect.drive.gui.html" title="The Drive Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.tasks.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.drive.gui.html">Next</a></li>
@@ -42,10 +42,10 @@
 <p id="ox.appsuite.user.content.drive">Topics: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">Drive</span> Components</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.download.html">Downloading Files or Folder Contents</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.html"><span class="phrase">Drive</span>: Adding Folders</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and <span class="phrase">Drive</span> Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.email.html b/help/l10n/en_US/ox.appsuite.user.chap.email.html
index b810ee407a5a277a34bc0ec1443326d89a37a480..f0c75db7a10b0fd8de004cf5fbdce0bad0952e01 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.email.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.email.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.portal.customize.createxing.html" title="Creating a Xing account">
+<link rel="prev" href="ox.appsuite.user.sect.portal.settings.html" title="Portal Settings">
 <link rel="next" href="ox.appsuite.user.sect.email.gui.html" title="The Email Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.portal.customize.createxing.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.portal.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.gui.html">Next</a></li>
@@ -35,7 +35,7 @@
 <div class="task" id="ox.appsuite.user.task.email.start">
 <p class="title">How to start the <span class="phrase">Email</span> app:</p>
 <div class="procedure"><ul class="procedure"><li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>All Applications</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span> in the menu bar. Click on <span class="phrase"><span class="guibutton"><strong>Email</strong></span></span> in the App Launcher.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>All Applications</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.start.applauncher"><object type="image/svg+xml" data="../../images/list.svg" height="15"></object></span>. Click on <span class="phrase"><span class="guibutton"><strong>Email</strong></span></span> in the App Launcher.</p>
 <p role="presentation">Depending on the configuration, you can also click the quick start icon in the menu bar for launching the <span class="phrase"><span class="guibutton"><strong>Email</strong></span></span> app.</p>
 </li></ul></div>
 </div>
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.html">The <span class="phrase">Email</span> Components</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p></li>
 <li class="listitem cap-switchboard" id="id-1.6.7.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.call.html">Calling the Sender or Another Recipient</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.guard.html b/help/l10n/en_US/ox.appsuite.user.chap.guard.html
index 1b32ad7a8ab9f704ba2af551ec5eef2d31c5823d..1802f0a4378cd83e31e47ce3b4ea270aea032b47 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.guard.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.guard.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.manage.html" title="Managing verification methods">
+<link rel="prev" href="ox.appsuite.user.sect.security.multifactor.html" title="Multi-Factor Authentication">
 <link rel="next" href="ox.appsuite.user.sect.guard.setup.html" title="Setting up Guard">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.manage.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.security.multifactor.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.guard.setup.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.security.html b/help/l10n/en_US/ox.appsuite.user.chap.security.html
index 85e57a3912c75277ab44d1d634f447c6d462c0c3..aac8c255fcf6c60f41ccb1f777a4d0aba1580ba4 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.security.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.security.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html" title="Viewing, editing, deleting accounts">
+<link rel="prev" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html" title="Downloading Personal Data">
 <link rel="next" href="ox.appsuite.user.sect.security.autologout.html" title="Signing out Automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.accounts.edit.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.security.autologout.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.chap.tasks.html b/help/l10n/en_US/ox.appsuite.user.chap.tasks.html
index aa15787b81965ecfa1efcc3a89fff5a2f95342af..14a8aefdd25b700b01ef5d4a3dddf2112ae816a2 100644
--- a/help/l10n/en_US/ox.appsuite.user.chap.tasks.html
+++ b/help/l10n/en_US/ox.appsuite.user.chap.tasks.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.contacts.manage.delete.html" title="Deleting contacts">
+<link rel="prev" href="ox.appsuite.user.sect.contacts.settings.html" title="Address Book Settings">
 <link rel="next" href="ox.appsuite.user.sect.tasks.gui.html" title="The Tasks Components">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.manage.delete.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.contacts.settings.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.tasks.gui.html">Next</a></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.index.html b/help/l10n/en_US/ox.appsuite.user.index.html
index ae0b01d726d5399a014e04d9fd1cd0884bdcf943..f7e4e12e25176a16dd83670d878b8210fd7f6bfc 100644
--- a/help/l10n/en_US/ox.appsuite.user.index.html
+++ b/help/l10n/en_US/ox.appsuite.user.index.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="index.html" title="User Guide">
-<link rel="prev" href="ox.appsuite.user.sect.guard.settings.html" title="Guard Settings">
+<link rel="prev" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html" title="Managing public keys">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -21,7 +21,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.settings.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.guard.keys.pgppublickeys.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 </ul></div>
@@ -58,7 +58,9 @@
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.attachments.html">add attachments</a>, <a class="indexterm" href="ox.appsuite.user.sect.tasks.add.attachments.html">add attachments</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+</dt>
+<dt class="cap-webmail">from existing email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">Add storage accounts, <a class="indexterm" href="ox.appsuite.user.sect.drive.accounts.html">Adding Storage Accounts</a>
@@ -162,11 +164,11 @@
 </dt>
 <dt class="cap-calendar cap-switchboard">call appointment participants, <a class="indexterm" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a>
 </dt>
-<dt class="cap-calendar">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a>
+<dt class="cap-calendar">change appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a>
 </dt>
 <dt class="cap-calendar">change reminder, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a>
 </dt>
-<dt class="cap-calendar">change the appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a>
+<dt class="cap-calendar">change the appointment status, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a>
 </dt>
 <dt class="cap-calendar">change the organizer, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a>
 </dt>
@@ -178,11 +180,15 @@
 </dt>
 <dt class="cap-calendar">create a follow-up appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
+</dt>
+<dt class="cap-calendar">create from iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a>
+</dt>
 <dt class="cap-deputy">create, edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.deputy.html">Creating, Editing or Managing Appointments as Deputy</a>
 </dt>
 <dt class="cap-calendar">delete, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.delete.html">Deleting appointments</a>
 </dt>
-<dt class="cap-calendar">display in calendar view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a>
+<dt class="cap-calendar">display in calendar view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a>
 </dt>
 <dt class="cap-calendar">display in list view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
 </dt>
@@ -192,13 +198,15 @@
 </dt>
 <dt class="cap-calendar">export, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
 </dt>
+<dt class="cap-calendar">find free times, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
+</dt>
 <dt class="cap-calendar">import, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
 <dt class="cap-calendar">invite email recipients to new appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a>
 </dt>
 <dt class="cap-calendar">invite from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.inviteappointment.html">Inviting contacts to an appointment</a>
 </dt>
-<dt class="cap-calendar">invite participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a>
+<dt class="cap-calendar">invite participants to a new appointment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a>
 </dt>
 <dt class="cap-calendar">manage, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
@@ -210,7 +218,7 @@
 </dt>
 <dt class="cap-calendar">reschedule to another day, <a class="indexterm" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a>
 </dt>
-<dt class="cap-calendar">resolve conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
+<dt class="cap-calendar">Resolving conflicts, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a>
 </dt>
 <dt class="cap-calendar">respond to invitations, <a class="indexterm" href="ox.appsuite.user.sect.calendar.invitation.html">Responding to Appointment Invitations</a>
 </dt>
@@ -239,17 +247,6 @@
 <dt class="cap-calendar">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.calendar.attachments.html">Viewing or Saving Appointment Attachments</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar">appointments</dt>
-<dd><dl>
-<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
-</dt>
-<dt class="cap-calendar">create from iCal, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a>
-</dt>
-<dt class="cap-calendar">display in calendar view, <a class="indexterm" href="ox.appsuite.user.sect.calendar.view.views.html">Displaying appointments in different views</a>
-</dt>
-<dt class="cap-calendar">find free times, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a>
-</dt>
-</dl></dd>
 <dt class="cap-guard">Autocrypt</dt>
 <dd><dl>
 <dt class="cap-guard">delete keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
@@ -318,7 +315,7 @@
 </dt>
 <dt class="cap-calendar">components, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.html">The Calendar Components</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">create appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
+<dt class="feat-io-ox-core-resourceCalendars">Creating appointments by using the resource calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a>
 </dt>
 <dt class="cap-calendar">date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
 </dt>
@@ -334,6 +331,8 @@
 </dt>
 <dt class="cap-calendar">mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
 </dt>
+<dt class="cap-calendar">Mini calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.minicalendar.html">The mini calendar</a>
+</dt>
 <dt class="cap-calendar">New appointment button, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.new.html">The New appointment button</a>
 </dt>
 <dt class="cap-calendar">pop-up, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.popup.html">The Calendar pop-up</a>
@@ -342,7 +341,7 @@
 </dt>
 <dt class="cap-calendar">settings, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar_google">subscribe to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
+<dt class="cap-calendar_google">subscribe to Google calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a>
 </dt>
 <dt class="cap-calendar">subscribe to iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a>
 </dt>
@@ -354,10 +353,10 @@
 </dt>
 <dt class="cap-calendar">use calendar colors, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.colors.html">Using calendar colors</a>
 </dt>
-<dt class="feat-io-ox-core-resourceCalendars">use resource calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">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 scheduling view</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">Using Resource Calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
+</dt>
 </dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">calendar</dt>
 <dd><dl><dt class="cap-share_links cap-share_mail_attachments">share, see sharing, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a>
@@ -376,7 +375,7 @@
 </dt>
 <dt class="cap-calendar">end of working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
-<dt class="cap-calendar">hide free&amp;busy, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">Free/Busy visibility, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">participants can edit appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -390,7 +389,7 @@
 </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">start of working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
+<dt class="cap-calendar">Start of working time, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
 <dt class="cap-calendar">subscribe to iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.settings.html">Calendar Settings</a>
 </dt>
@@ -488,7 +487,7 @@
 </dl></dd>
 <dt class="">Context menu</dt>
 <dd><dl>
-<dt class="cap-infostore">Drive display area, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.content.html">The Drive display area</a>
+<dt class="cap-infostore">Drivedisplay area, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.content.html">The Drive display area</a>
 </dt>
 <dt class="cap-webmail">Emaillist view, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.list.html">The Email list view</a>
 </dt>
@@ -518,7 +517,7 @@
 <div class="indexdiv">
 <h3>D</h3>
 <dl>
-<dt class="cap-calendar">Date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
+<dt class="cap-calendar">date picker, <a class="indexterm" href="ox.appsuite.user.sect.calendar.gui.datepicker.html">The date picker</a>
 </dt>
 <dt class="">Definitions, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Terminology</a>
 </dt>
@@ -530,7 +529,7 @@
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.delete.html">Deleting contacts</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a>
 </dt>
 <dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or Drive folders</a>
 </dt>
@@ -580,7 +579,7 @@
 </dt>
 <dt class="cap-webmail">emails, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a>
 </dt>
-<dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a>
+<dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">view files</a>
 </dt>
 <dt class="cap-infostore">files in the viewer, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a>
 </dt>
@@ -634,10 +633,10 @@
 </dt>
 <dt class="cap-infostore">create folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: creating folders</a>
 </dt>
-<dt class="cap-infostore">create or edit descriptions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a>
-</dt>
 <dt class="cap-infostore">create or edit text files, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
 </dt>
+<dt class="cap-infostore">Creating or editing descriptions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a>
+</dt>
 <dt class="cap-infostore">delete files or folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or Drive folders</a>
 </dt>
 <dt class="cap-infostore">display a file's content, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a>
@@ -650,9 +649,9 @@
 </dt>
 <dt class="cap-infostore">file details, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.details.html">The file details</a>
 </dt>
-<dt class="cap-infostore">folder view, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.foldertree.html">The Drive folder view</a>
+<dt class="cap-infostore">Folder view, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.foldertree.html">The Drive folder view</a>
 </dt>
-<dt class="cap-infostore">lock or unlock files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a>
+<dt class="cap-infostore">Locking or unlocking files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a>
 </dt>
 <dt class="cap-infostore">move files or folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.move.html">Moving files or Drive folders</a>
 </dt>
@@ -662,33 +661,33 @@
 </dt>
 <dt class="cap-infostore">organize files and folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
 </dt>
-<dt class="cap-infostore">print files as PDF, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
+<dt class="cap-infostore">Printing files as PDF, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
 </dt>
 <dt class="cap-infostore">Saving files as PDF, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Saving files as PDF</a>
 </dt>
 <dt class="cap-infostore">search for files, <a class="indexterm" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a>
 </dt>
-<dt class="cap-infostore">send files as email attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.send.html">Sending files as email attachments</a>
+<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>
-<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 class="cap-contacts">subscribe to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared Drive folders</a>
 </dt>
 <dt class="cap-infostore">the Settings menu, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.settingsmenu.html">The Settings menu</a>
 </dt>
 <dt class="cap-infostore">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.toolbar.html">The Drive toolbar</a>
 </dt>
-<dt class="cap-infostore">upload files, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
+<dt class="cap-infostore">upload files, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a>
 </dt>
-<dt class="cap-infostore">upload folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
+<dt class="cap-infostore">upload folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a>
 </dt>
-<dt class="cap-infostore">view files, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a>
+<dt class="cap-infostore">view files, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">view files</a>
 </dt>
-<dt class="cap-infostore">view folder contents, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing Drive folder contents</a>
+<dt class="cap-infostore">view folder contents, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.objects.html">view Drive folder contents</a>
 </dt>
 <dt class="cap-infostore">viewer, <a class="indexterm" href="ox.appsuite.user.sect.drive.gui.viewer.html">The viewer</a>
 </dt>
-<dt class="cap-infostore">work with versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a>
+<dt class="cap-infostore">work with versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a>
 </dt>
 </dl></dd>
 <dt class="cap-infostore">Drive settings</dt>
@@ -723,7 +722,7 @@
 </dt>
 <dt class="cap-infostore">text file, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
 </dt>
-<dt class="cap-infostore">versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a>
+<dt class="cap-infostore">versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a>
 </dt>
 </dl></dd>
 <dt class="">editing window, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.create.html">The editing window</a>
@@ -731,7 +730,7 @@
 <dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.chap.email.html">Email</a>
 </dt>
 <dd><dl>
-<dt class="cap-webmail">add attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+<dt class="cap-webmail">add attachments from existing emails, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a>
 </dt>
 <dt class="cap-webmail">add email account, <a class="indexterm" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a>
 </dt>
@@ -739,6 +738,8 @@
 </dt>
 <dt class="cap-portal">add to portal, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a>
 </dt>
+<dt class="cap-webmail">Adding attachments, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a>
+</dt>
 <dt class="cap-webmail">archive, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a>
 </dt>
 <dt class="cap-webmail">assign color, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.label.html">Categorizing emails</a>
@@ -769,14 +770,14 @@
 </dt>
 <dt class="cap-webmail">display, <a class="indexterm" href="ox.appsuite.user.sect.email.view.html">Viewing Emails</a>
 </dt>
-<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
-</dt>
 <dt class="cap-deputy">edit, manage as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
 </dt>
 <dt class="cap-webmail">editing window, <a class="indexterm" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a>
 </dt>
 <dt class="cap-guard">encrypt incoming emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.incoming.html">Encrypting incoming emails by using a filter rule</a>
 </dt>
+<dt class="feat-io-ox-core-mailPDFExport">export as PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a>
+</dt>
 <dt class="">external images, <a class="indexterm" href="ox.appsuite.user.sect.security.emaillinkedimages.html">Externally Linked Images in Emails</a>
 </dt>
 <dt class="cap-webmail">filters, <a class="indexterm" href="ox.appsuite.user.sect.email.mailfilter.html">Using Email Filters</a>
@@ -823,7 +824,7 @@
 </dt>
 <dt class="cap-webmail">search, <a class="indexterm" href="ox.appsuite.user.sect.email.search.html">Searching for Emails</a>
 </dt>
-<dt class="cap-webmail">select a sender address, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a>
+<dt class="cap-webmail">Selecting a sender address, <a class="indexterm" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a>
 </dt>
 <dt class="cap-webmail">send, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
@@ -831,7 +832,7 @@
 </dt>
 <dt class="cap-deputy">send as deputy, <a class="indexterm" href="ox.appsuite.user.sect.email.deputy.html">Sending or Receiving Emails as Deputy</a>
 </dt>
-<dt class="cap-infostore">send attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a>
+<dt class="cap-infostore">send attachments as link, <a class="indexterm" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a>
 </dt>
 <dt class="cap-guard">send encrypted emails, <a class="indexterm" href="ox.appsuite.user.sect.guard.email.send.html">Sending encrypted emails</a>
 </dt>
@@ -861,6 +862,8 @@
 </dt>
 <dt class="cap-webmail">use signatures, <a class="indexterm" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a>
 </dt>
+<dt class="feat-io-ox-core-templates">Using templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
+</dt>
 <dt class="cap-guard">verify Autocrypt keys, <a class="indexterm" href="ox.appsuite.user.sect.guard.autocrypt.manage.html">Managing Autocrypt keys</a>
 </dt>
 <dt class="cap-webmail">view attachment, <a class="indexterm" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a>
@@ -872,6 +875,8 @@
 </dt>
 <dt class="feat-io-ox-core-enterprisePicker">automatically add from address directory, <a class="indexterm" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a>
 </dt>
+<dt class="cap-infostore">display attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
+</dt>
 <dt class="cap-webmail">send from address book, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendmail.html">Sending emails from within an address book</a>
 </dt>
 <dt class="cap-webmail">Using Allowlists, <a class="indexterm" href="ox.appsuite.user.sect.security.whitelist.html">Using Allowlists</a>
@@ -943,7 +948,7 @@
 </dt>
 <dt class="cap-webmail">show date and time, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
-<dt class="cap-webmail">Show folder with all flagged messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
+<dt class="cap-webmail">show folder with all flagged messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
 <dt class="cap-webmail">show folder with all unseen messages, <a class="indexterm" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a>
 </dt>
@@ -1002,12 +1007,14 @@
 <dt class="cap-guard">remove key, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.decrypt.html">Decrypting files</a>
 </dt>
 </dl></dd>
-<dt class="cap-calendar">Export</dt>
+<dt class="feat-io-ox-core-mailPDFExport">Export</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.export.html">Exporting contacts</a>
 </dt>
+<dt class="feat-io-ox-core-mailPDFExport">emails as PDF, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a>
+</dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.export.html">Exporting tasks</a>
 </dt>
 </dl></dd>
@@ -1027,14 +1034,13 @@
 <dl>
 <dt class="cap-calendar">Favorites</dt>
 <dd><dl>
+<dt class="cap-infostore">add files or Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or Drive folders to Favorites</a>
+</dt>
 <dt class="cap-calendar">favorite time zones, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite timezones</a>
 </dt>
 <dt class="">folder favorites, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.favorite.html">Adding folders to favorites</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">favorites</dt>
-<dd><dl><dt class="cap-infostore">add files or Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or Drive folders to Favorites</a>
-</dt></dl></dd>
 <dt class="cap-infostore">File</dt>
 <dd><dl>
 <dt class="cap-webdav">access with WebDAV, <a class="indexterm" href="ox.appsuite.user.sect.drive.webdav.html">Accessing Files with WebDAV</a>
@@ -1053,7 +1059,7 @@
 </dt>
 <dt class="cap-infostore">delete, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or Drive folders</a>
 </dt>
-<dt class="cap-infostore">display, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a>
+<dt class="cap-infostore">display, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.html">view files</a>
 </dt>
 <dt class="cap-infostore">display email attachments, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in Drive</a>
 </dt>
@@ -1065,7 +1071,7 @@
 </dt>
 <dt class="cap-infostore">edit description, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a>
 </dt>
-<dt class="cap-infostore">edit versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a>
+<dt class="cap-infostore">edit versions, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a>
 </dt>
 <dt class="cap-guard">encrypt, <a class="indexterm" href="ox.appsuite.user.sect.guard.drive.encrypt.html">Encrypting files</a>
 </dt>
@@ -1091,7 +1097,7 @@
 </dt>
 <dt class="cap-infostore">unlock, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a>
 </dt>
-<dt class="cap-infostore">upload, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
+<dt class="cap-infostore">upload, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a>
 </dt>
 <dt class="cap-webdav">WebDAV under Linux, <a class="indexterm" href="ox.appsuite.user.sect.drive.webdav.linux.html">Setting up WebDAV under Linux</a>
 </dt>
@@ -1112,7 +1118,7 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">subscribe to email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a>
 </dt>
-<dt class="cap-infostore">view Drive folder contents, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing Drive folder contents</a>
+<dt class="cap-infostore">view Drive folder contents, <a class="indexterm" href="ox.appsuite.user.sect.drive.view.objects.html">view Drive folder contents</a>
 </dt>
 </dl></dd>
 <dt class="">Folder structure</dt>
@@ -1163,7 +1169,7 @@
 </dt>
 <dt class="">type, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.folder.kind.html">What are folder types?</a>
 </dt>
-<dt class="cap-infostore">upload, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
+<dt class="cap-infostore">upload, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a>
 </dt>
 </dl></dd>
 </dl>
@@ -1281,22 +1287,25 @@
 <dt class="cap-tasks">import, task, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">Import</dt>
+<dt class="cap-webmail">import</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.import.html">Importing appointments</a>
 </dt>
-<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a>
+</dt>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
 </dt>
+</dl></dd>
+<dt class="cap-contacts">Import</dt>
+<dd><dl>
 <dt class="cap-contacts">contacts in CSV format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
 <dt class="cap-contacts">contacts in vCard format, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.import.html">Importing contacts</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a>
-</dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a>
 </dt>
 </dl></dd>
-<dt class="cap-webmail">Inbox tabs</dt>
+<dt class="cap-webmail">inbox tabs</dt>
 <dd><dl><dt class="cap-webmail">working with, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.categories.html">Working with inbox tabs</a>
 </dt></dl></dd>
 </dl>
@@ -1366,20 +1375,22 @@
 <div class="indexdiv">
 <h3>M</h3>
 <dl>
-<dt class="cap-webmail">Manage</dt>
+<dt class="cap-webmail">manage</dt>
+<dd><dl>
+<dt class="cap-webmail">emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
+</dt>
+<dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
+</dt>
+</dl></dd>
+<dt class="cap-calendar">Manage</dt>
 <dd><dl>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a>
 </dt>
 <dt class="cap-contacts">contacts, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.html">Managing Contacts</a>
 </dt>
-<dt class="cap-webmail">emails, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a>
-</dt>
 <dt class="cap-tasks">tasks, <a class="indexterm" href="ox.appsuite.user.sect.tasks.manage.html">Managing Tasks</a>
 </dt>
 </dl></dd>
-<dt class="cap-infostore">manage</dt>
-<dd><dl><dt class="cap-infostore">files, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and Drive Folders</a>
-</dt></dl></dd>
 <dt class="">Manage accounts, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.accounts.html">Managing Accounts</a>
 </dt>
 <dt class="cap-multifactor">Manage verification methods, <a class="indexterm" href="ox.appsuite.user.sect.security.multifactor.manage.html">Managing verification methods</a>
@@ -1420,7 +1431,7 @@
 </dt>
 <dt class="cap-calendar">appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a>
 </dt>
-<dt class="cap-calendar">calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
+<dt class="cap-calendar">Calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.html">Adding Calendars</a>
 </dt>
 <dt class="cap-contacts">contact, <a class="indexterm" href="ox.appsuite.user.sect.contacts.add.create.html">Creating a new contact</a>
 </dt>
@@ -1432,7 +1443,7 @@
 </dt>
 <dt class="cap-infostore">Drivefolders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.html">Drive: Adding Folders</a>, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.personal.html">Drive: creating folders</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 <dt class="cap-webmail">email folders, <a class="indexterm" href="ox.appsuite.user.sect.email.folder.html">Adding Email Folders</a>
 </dt>
@@ -1478,10 +1489,15 @@
 <dt class="">Using Application Passwords, <a class="indexterm" href="ox.appsuite.user.sect.security.apppasswords.html">Using Application Passwords</a>
 </dt>
 </dl></dd>
+<dt class="feat-io-ox-core-mailPDFExport">PDF</dt>
+<dd><dl>
+<dt class="feat-io-ox-core-mailPDFExport">export email as, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a>
+</dt>
 <dt class="cap-infostore">PDF, print files as, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
 </dt>
 <dt class="cap-infostore">PDF, save files as, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Saving files as PDF</a>
 </dt>
+</dl></dd>
 <dt class="cap-share_links cap-share_mail_attachments">Permission examples, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.examples.html">Use cases for permissions</a>
 </dt>
 <dt class="">permissions</dt>
@@ -1578,7 +1594,7 @@
 </dt>
 <dt class="cap-infostore">documents, text files, images, <a class="indexterm" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a>
 </dt>
 <dt class="cap-calendar">list of appointments, <a class="indexterm" href="ox.appsuite.user.sect.calendar.manage.print.html">Printing appointments</a>
 </dt>
@@ -1624,10 +1640,10 @@
 </dt>
 <dt class="cap-edit_resource">use, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resources.html">Using Resources</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="feat-io-ox-core-managedResources">use, managed resources, <a class="indexterm" href="ox.appsuite.user.sect.calendar.managedresources.html">Using Managed Resources</a>
 </dt>
+<dt class="feat-io-ox-core-resourceCalendars">Using Resource Calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.resourcecalendar.html">Using Resource Calendars</a>
+</dt>
 </dl></dd>
 <dt class="feat-io-ox-core-resourceCalendars">Resource calendar</dt>
 <dd><dl>
@@ -1693,7 +1709,7 @@
 <dd><dl>
 <dt class="cap-contacts">contacts as vCard, <a class="indexterm" href="ox.appsuite.user.sect.contacts.manage.sendvcard.html">Sending contacts as vCard</a>
 </dt>
-<dt class="cap-webmail">email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
+<dt class="cap-webmail">Email, <a class="indexterm" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a>
 </dt>
 </dl></dd>
 <dt class="cap-switchboard">Set the presence status, <a class="indexterm" href="ox.appsuite.user.sect.settings.presencestatus.html">Setting the Presence Status</a>
@@ -1769,7 +1785,7 @@
 </dt>
 <dt class="cap-calendar">subscribe to public and shared calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a>
 </dt>
-<dt class="cap-contacts">subscribe to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared Drive folders</a>
+<dt class="cap-contacts">subscribe to public and shared Drive folders, <a class="indexterm" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared Drive folders</a>
 </dt>
 <dt class="cap-contacts">subscribe to public and shared task lists, <a class="indexterm" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a>
 </dt>
@@ -1788,7 +1804,7 @@
 </dt>
 <dt class="cap-share_links cap-share_mail_attachments">email folders, <a class="indexterm" href="ox.appsuite.user.sect.dataorganisation.sharing.subscribeimap.html">Subscribing to shared or personal email folders</a>
 </dt>
-<dt class="cap-calendar_google">Google calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a>
+<dt class="cap-calendar_google">Google calendar, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a>
 </dt>
 <dt class="cap-calendar">iCal calendars, <a class="indexterm" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a>
 </dt>
@@ -1896,6 +1912,9 @@
 </dl></dd>
 <dt class="">Terminology, <a class="indexterm" href="ox.appsuite.user.sect.about.glossary.html">Terminology</a>
 </dt>
+<dt class="cap-infostore">Text file</dt>
+<dd><dl><dt class="cap-infostore">edit, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
+</dt></dl></dd>
 <dt class="cap-infostore">Text files</dt>
 <dd><dl><dt class="cap-infostore">create, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
 </dt></dl></dd>
@@ -1908,9 +1927,6 @@
 </dl></dd>
 <dt class="">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.toolbar.html">The toolbar</a>
 </dt>
-<dt class="cap-infostore">Ttext file</dt>
-<dd><dl><dt class="cap-infostore">edit, <a class="indexterm" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a>
-</dt></dl></dd>
 </dl>
 </div>
 <div class="indexdiv">
@@ -1919,7 +1935,7 @@
 <dt class="cap-webmail">Unified Mail, <a class="indexterm" href="ox.appsuite.user.sect.email.manage.unifiedmail.html">Using Unified Mail</a>
 </dt>
 <dt class="cap-infostore">Upload</dt>
-<dd><dl><dt class="cap-infostore">file or folder, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a>
+<dd><dl><dt class="cap-infostore">file or folder, <a class="indexterm" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a>
 </dt></dl></dd>
 <dt class="">Usage on mobile devices, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.mobile.html">Notes on Use on Mobile Devices</a>
 </dt>
@@ -1962,6 +1978,8 @@
 <dt class="">toolbar, <a class="indexterm" href="ox.appsuite.user.sect.firststeps.gui.toolbar.html">The toolbar</a>
 </dt>
 </dl></dd>
+<dt class="feat-io-ox-core-templates">Using templates, <a class="indexterm" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a>
+</dt>
 </dl>
 </div>
 <div class="indexdiv">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.alarms.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.alarms.html
index 6c0086701f10a9484897222ef989e4cacfccae1b..fb815eda76336eb080db3994ce10a801e01345f6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.alarms.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.alarms.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.display.html" title="Setting an appointment's display">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Adding participants or resources">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.alarms">
 <div class="titlepage"><div><div><h3 class="title">Using appointment reminders</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.12.2"></a><p id="ox.appsuite.user.concept.calendar.add.alarms">When creating or editing an appointment, you can set to be reminded of the appointment's due date. To do so, you can use one or several of the following notifications: </p>
@@ -59,7 +59,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.alarms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.alarms">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attachments.html
index f883cc0c011c6a481b8568fde694c33f116a9297..4e151ef630bf0843d7b5e04e1781db416be521c5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.participants.html" title="Adding participants or resources">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the scheduling view">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attachments">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.14.2"></a><a class="indexterm" name="id-1.7.10.14.3"></a><p id="ox.appsuite.user.concept.calendar.add.attachments">Depending on the configuration, you can attach files that are saved on your computer or in the <span class="phrase">Drive</span> app.</p>
@@ -53,7 +53,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
index 1ebf90fe5a44098b9c0ccb94d299b21cc7bf5250..928accc87c0e2b17f6f1721e25a57cddf3248a88 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.attendees.html
@@ -1,11 +1,11 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Inviting participants to a new appointment</title>
+<title>invite participants to a new appointment</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creating a follow-up appointment">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviting email recipients to new appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,17 +30,17 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.attendees">
-<div class="titlepage"><div><div><h3 class="title">Inviting participants to a new appointment</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">invite participants to a new appointment</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.17.2"></a><p id="ox.appsuite.user.concept.calendar.add.attendees">If an appointment has several participants, you can invite those participants to a new appointment.</p>
 <div class="task" id="ox.appsuite.user.task.calendar.add.attendees">
 <p class="title">How to invite participants to a new appointment:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">In a calendar view, click on an appointment with multiple participants. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.attendees.popup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">In the list view, select an appointment with multiple participants. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.attendees.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">In a calendar view, click on an appointment with multiple participants. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.attendees.popup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">In the list view, select an appointment with multiple participants. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.attendees.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p>
 <p role="presentation">Click on <span class="guibutton"><strong>Invite to new appointment</strong></span>.</p>
 </li>
@@ -65,7 +65,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.call.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.call.html
index 6d93e1cf1dea11e1f4767c3a3fd3dcd6b7ab039b..b9dcfb744e7e399089b5bde97ab2377e84a7654f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.call.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.call.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Using the date picker">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Setting recurring appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.call">
 <div class="titlepage"><div><div><h3 class="title">Scheduling audio/video conferences</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.9.2"></a><a class="indexterm" name="id-1.7.10.9.3"></a><a class="indexterm" name="id-1.7.10.9.4"></a><a class="indexterm" name="id-1.7.10.9.5"></a><a class="indexterm" name="id-1.7.10.9.6"></a><p id="ox.appsuite.user.precondition.calendar.add.call">Prerequisite: You have set up an account with an audio or video conference provider.</p>
@@ -66,7 +66,7 @@
 <p role="presentation" class="feat-jitsi"><a class="xref" href="ox.appsuite.user.sect.settings.jitsi.html">Configuring Jitsi Integration</a></p>
 <p role="presentation" class="feat-zoom"><a class="xref" href="ox.appsuite.user.sect.settings.zoom.html">configure Zoom integration</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.call">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.call">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
index b3b42148f2ae63e33b2fd8c9f7d2df4686898224..7bde80a52da85b0eaa27826dbe3053e07c3a6393 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.conflicthandling.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creating appointments from iCal attachments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.invitation.html" title="Responding to Appointment Invitations">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.conflicthandling">
 <div class="titlepage"><div><div><h3 class="title">Resolving conflicts</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.20.2"></a><p id="ox.appsuite.user.concept.calendar.add.conflicthandling">A conflict occurs when the following circumstances coincide: </p>
@@ -67,7 +67,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.conflicthandling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
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 7d70dcb9d427f71ce4216d5c355c94040a38b13a..b7e979030a3795321e81513c3c5fd00f0acb768c 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
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.datepicker.html" title="Using the date picker">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.create">
 <div class="titlepage"><div><div><h3 class="title">Creating new appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.7.2"></a><a class="indexterm" name="id-1.7.10.7.3"></a><div class="task" id="ox.appsuite.user.task.calendar.add.create">
@@ -39,7 +39,7 @@
 <li class="step"><p role="presentation">In the folder view, open a calendar for which you have the permission to create objects.</p></li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>New appointment</strong></span>.</p>
-<p role="presentation">If you work in another app and you do not want to leave that app, you can use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.create.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the button for creating objects.</p>
+<p role="presentation">If you work in another app and you do not want to leave that app, you can use the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.create.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> on the button for creating new objects.</p>
 <p role="presentation">If selecting a shared calendar, you are asked where to create the appointment: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">If you create the appointment on behalf of the owner, the appointment is created in the owner's shared calendar.</p></li>
 <li class="listitem"><p role="presentation">If you invite the owner to the appointment, the appointment is saved in your calendar.</p></li>
@@ -102,7 +102,7 @@
 <p role="presentation" class="feat-io-ox-core-resourceCalendars"><a class="xref" href="ox.appsuite.user.sect.calendar.resourcecalendar.create.html">Creating appointments by using the resource calendar</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
@@ -111,7 +111,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p></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>
+<p id="ox.appsuite.user.parent.calendar.add.create">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.datepicker.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.datepicker.html
index 20e9366e50d1ea823b2cdb49ed3ef225ebec2cd1..f95ee9a1b6b8f0be73299d3a01b81cfdc79799e6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.datepicker.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.datepicker.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.create.html" title="Creating new appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.call.html" title="Scheduling audio/video conferences">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.datepicker">
 <div class="titlepage"><div><div><h3 class="title">Using the date picker</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.8.2"></a><p id="ox.appsuite.user.concept.calendar.add.datepicker">The date picker allows you to select the date to be entered in a date field.</p>
@@ -47,7 +47,7 @@
 <p role="presentation">To select a date from another month, you have the following options:</p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">Navigate to the required month by using the <span class="guibutton"><strong>Browse</strong></span> icons <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.datepicker.browse.month"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>.</p>
+<p role="presentation">Navigate to the required month by using the <span class="guibutton"><strong>Browse</strong></span> icons<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.datepicker.browse.month"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span> on the button for creating new objects.</p>
 <p role="presentation">You can also click on the month name in the header. The year will be displayed. Click on the wanted month.</p>
 </li>
 <li class="listitem"><p role="presentation">Click on the wanted day.</p></li>
@@ -58,7 +58,7 @@
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Click on the month name in the header. The current year will be displayed.</p></li>
 <li class="listitem">
-<p role="presentation">Navigate to the required year by using the <span class="guibutton"><strong>Browse</strong></span> icons <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.datepicker.browse.year"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span>.</p>
+<p role="presentation">Navigate to the required year by using the <span class="guibutton"><strong>Browse</strong></span> icons<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.datepicker.browse.year"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span> on the button for creating new objects.</p>
 <p role="presentation">You can also click on the year in the header. A time range of 12 months will be displayed. Click on the wanted year.</p>
 </li>
 <li class="listitem"><p role="presentation">Click on the wanted month. Click on the wanted day.</p></li>
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.edit.html">Editing Tasks</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.datepicker">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.datepicker">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
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 a92f77c3102238aa29d96a2cccd86579c4ee98d7..ec2dc5121b5f0b4b4b72cea193418df9fd6ad530 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
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.serial.html" title="Setting recurring appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Using appointment reminders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.display">
 <div class="titlepage"><div><div><h3 class="title">Setting an appointment's display</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.11.2"></a><p id="ox.appsuite.user.concept.calendar.add.display">The following options exist: </p>
@@ -52,9 +52,9 @@
 </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>
-<li class="listitem"><p role="presentation">If only the appointment date should be visible for other users but not the subject or other appointment data, select <span class="guibutton"><strong>Private</strong></span>. Private appointments are marked with the <span class="guibutton"><strong>Private</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.display.private"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">If only the appointment date should be visible for other users but not the subject or other appointment data, select <span class="guibutton"><strong>Private</strong></span>. Private appointments are marked with the <span class="guibutton"><strong>Private</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.display.private"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span> .</p></li>
 <li class="listitem">
-<p role="presentation">If the appointment is to be invisible for other users, select <span class="guibutton"><strong>Secret</strong></span> from the drop-down. Secret appointments are marked with the <span class="guibutton"><strong>Secret</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.display.secret"><object type="image/svg+xml" data="../../images/person-circle.svg" height="15"></object></span>.</p>
+<p role="presentation">If the appointment is to be invisible for other users, select <span class="guibutton"><strong>Secret</strong></span> from the drop-down. Secret appointments are marked with the <span class="guibutton"><strong>Secret</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.display.secret"><object type="image/svg+xml" data="../../images/person-circle.svg" height="15"></object></span> .</p>
 <p role="presentation">Secret appointments do not conflict with other appointments. They are not displayed in the scheduling view.</p>
 </li>
 </ul></p></li>
@@ -70,7 +70,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.view.appointments.html">How are appointments displayed in a calendar view? </a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.display">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.display">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
index 2ccec81f653e6f9d0b25ec1f994a82e486819d47..46d1d5f9b4bf80b1564a84139355295f8461c0c2 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.followup.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.scheduling.html" title="Using the scheduling view">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="invite participants to a new appointment">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.followup">
 <div class="titlepage"><div><div><h3 class="title">Creating a follow-up appointment</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.16.2"></a><a class="indexterm" name="id-1.7.10.16.3"></a><p id="ox.appsuite.user.concept.calendar.add.followup">You can create a follow-up appointment for an existing appointment. The follow-up appointment will be prefilled with essential data from the existing appointment.</p>
@@ -39,8 +39,8 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.followup.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.followup.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.followup.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.followup.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p>
 <p role="presentation">Click on <span class="guibutton"><strong>Follow-up</strong></span>.</p>
 </li>
@@ -62,7 +62,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.followup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.followup">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
index ca2737161e496ba3e1379fa5718d079cf4ab85f3..ec16e983437d053f0fb6c27a4c8e47dd7e3ae465 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Creating Appointments</title>
+<title>Create appointments</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.add">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Creating Appointments</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Create appointments</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.calendar.add">Learn how to create an appointment and about the functions available for defining the appointment data: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li>
@@ -44,7 +44,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attachments.html">Adding attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.recipients.html">Inviting email recipients to new appointments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.icalattachment.html">Creating appointments from iCal attachments</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
index d6485468c325b7292ac86013033eb53f3494b80e..62927f5fcb6dad4baf107b2c191d249595c13d02 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.icalattachment.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.recipients.html" title="Inviting email recipients to new appointments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html" title="Resolving conflicts">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.icalattachment">
 <div class="titlepage"><div><div><h3 class="title">Creating appointments from iCal attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.19.2"></a><a class="indexterm" name="id-1.7.10.19.3"></a><p id="ox.appsuite.user.concept.calendar.add.icalattachment">You can create an appointment from an email's iCal attachment. An iCal attachment can be identified by the file extension .ics.</p>
@@ -47,7 +47,7 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.icalattachment">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
index 0f7e6d7e3300cbeba6fa02c7ea9658484a3634b3..3232472dae6c2d5894d8317022386abe8761328c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.participants.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.alarms.html" title="Using appointment reminders">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Adding attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.participants">
 <div class="titlepage"><div><div><h3 class="title">Adding participants or resources</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.13.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.participants">
@@ -50,8 +50,8 @@
 <li class="listitem"><p role="presentation">Participants can add other participants but not remove participants. Participants can not remove themselves from the appointment.</p></li>
 </ul></p></li>
 <li class="step">
-<p role="presentation">To remove participants or resources, click the <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.participants.remove"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>.</p>
-<p role="presentation">As default, you are entered as organizer when creating the appointment. If you create the appointment in a public calendar, you can remove the organizer from the appointment. To do so, click the <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.participants.removeorganizor"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>.</p>
+<p role="presentation">To remove participants or resources, click the <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.participants.remove"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the name.</p>
+<p role="presentation">As default, you are entered as organizer when creating the appointment. If you create the appointment in a public calendar, you can remove the organizer from the appointment. To do so, click the <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.participants.removeorganizor"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the organizer.</p>
 </li>
 </ol></div>
 <div class="taskrelated">
@@ -64,7 +64,7 @@
           <p role="presentation" class="feat-io-ox-core-managedResources">Note: When adding a managed resource, the booking delegate receives a booking request for this resource. As soon as the booking delegate accepts or declines your booking request for the resource, you will be informed.</p>
         </div>
 </div>
-<p id="ox.appsuite.user.tip.calendar.add.participants">Tip: To find free appointments of all participants and resources you can <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">use the schedule view</a>.</p>
+<p id="ox.appsuite.user.tip.calendar.add.participants">Tip: To find free appointments of all participants and resources you can  <a class="link" href="ox.appsuite.user.sect.calendar.add.scheduling.html">use the schedule view</a>.</p>
 <p id="ox.appsuite.user.related.calendar.add.participants"></p>
 <p class="title">Superordinate actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
@@ -77,7 +77,7 @@
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
 <p role="presentation" class="feat-io-ox-core-enterprisePicker"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressdirectory.html">Automatically Adding Contacts or Resources from the Address Directory</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.participants">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html
index 3657c013bba0fd90f7240cff115d3fa391ff07f0..5a45ffb0c60268248b1458db2e4583fe1fb7a635 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.recipients.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="Inviting participants to a new appointment">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.add.attendees.html" title="invite participants to a new appointment">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.icalattachment.html" title="Creating appointments from iCal attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.recipients">
 <div class="titlepage"><div><div><h3 class="title">Inviting email recipients to new appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.18.2"></a><p id="ox.appsuite.user.concept.calendar.add.recipients">You can invite the recipients of an email sent or received to a new appointment.</p>
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email in the <span class="phrase">Email</span> app.</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.calendar.add.recipients.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view.</p>
+<p role="presentation">In the detail view, click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.recipients.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p>
 <p role="presentation">Click on <span class="guibutton"><strong>Invite to appointment</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Complete the details for creating an appointment.</p></li>
@@ -50,14 +50,14 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.conflicthandling.html">Resolving conflicts</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.calendar.add.recipients">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.recipients">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
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 b058a54369581392cc1f346e06f23d916a3c1c40..58bf118ce6a1eb5f4d6bd0fb08dcaff0cfe3371c 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
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.attachments.html" title="Adding attachments">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.followup.html" title="Creating a follow-up appointment">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,11 +30,11 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.scheduling">
 <div class="titlepage"><div><div><h3 class="title">Using the scheduling view</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.15.2"></a><a class="indexterm" name="id-1.7.10.15.3"></a><a class="indexterm" name="id-1.7.10.15.4"></a><a class="indexterm" name="id-1.7.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 whether your appointments will be displayed in the scheduling view.</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>
 <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">
@@ -47,7 +47,7 @@
 <li class="listitem"><p role="presentation">While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p></li>
 <li class="listitem"><p role="presentation">To select contacts from an address book, click the <span class="guibutton"><strong>Select contact</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.scheduling.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> on the right side of the input field.</p></li>
 </ul> The appointments of the participant or resource are displayed in the calendar sheet.</p>
-<p role="presentation">If you opened the scheduling view by clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.scheduling.more.distributionlist"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>, you can save the participants as distribution list. To do so, select <span class="guibutton"><strong>Save as distribution list</strong></span> below the list.</p>
+<p role="presentation">If you opened the scheduling view by clicking the <span class="guibutton"><strong>More actions</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.add.scheduling.more.distributionlist"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>  next to <span class="guibutton"><strong>New appointment</strong></span>, you can save the participants as distribution list. To do so, select <span class="guibutton"><strong>Save as distribution list</strong></span> below the list.</p>
 </li>
 <li class="step"><p role="presentation">Search for a free time in the calendar. Use the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To set a time range, click on the date on the upper left side. You can also use the browse icons</p></li>
@@ -86,12 +86,12 @@
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.create.html">Creating new appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 <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.hidefreebusy">Hide free&amp;busy</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.hidefreebusy">Free/Busy visibility</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>
+<p id="ox.appsuite.user.parent.calendar.add.scheduling">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.serial.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.serial.html
index cc28230b433d40ccd0318f553ebd3fd1cac2263c..722c3807b36590c75ac2ff751b287d69e419f22d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.serial.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.add.serial.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="up" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.add.call.html" title="Scheduling audio/video conferences">
 <link rel="next" href="ox.appsuite.user.sect.calendar.add.display.html" title="Setting an appointment's display">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
-<h2 class="sr-only">Creating Appointments</h2>
+<h2 class="sr-only">Create appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.add.serial">
 <div class="titlepage"><div><div><h3 class="title">Setting recurring appointments</h3></div></div></div>
 <a class="indexterm" name="id-1.7.10.10.2"></a><div class="task" id="ox.appsuite.user.task.calendar.add.serial">
@@ -103,7 +103,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.add.serial.html">Creating recurring tasks</a></p></li></ul>
-<p id="ox.appsuite.user.parent.calendar.add.serial">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p id="ox.appsuite.user.parent.calendar.add.serial">Parent topic: <a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.attachments.html
index 67275b1b2be833a5333c4330be782b9a9596bba3..33ae3dc998c0c3fb75a51aa2a75214e780a550dd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.view.appointments.html" title="How are appointments displayed in a calendar view?">
-<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Creating Appointments">
+<link rel="next" href="ox.appsuite.user.sect.calendar.add.html" title="Create appointments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
index eee6f9d3fc446f820309ee481097a2c00da78e86..051158e4d7d2916a89b14e25190101147b120cb5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.deputy.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.deputy">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Creating, Editing or Managing Appointments as Deputy</h2></div></div></div>
-<a class="indexterm" name="id-1.7.18.2"></a><a class="indexterm" name="id-1.7.18.3"></a><p id="ox.appsuite.user.orientation.calendar.deputy">Learn how to act as another user’s <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. Depending on the permissions granted by this user, you can do the following in the user’s calendar: </p>
+<a class="indexterm" name="id-1.7.18.2"></a><a class="indexterm" name="id-1.7.18.3"></a><p id="ox.appsuite.user.orientation.calendar.deputy">Learn how to act as another user’s<a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">Deputy</a> . Depending on the permissions granted by this user, you can do the following in the user’s calendar: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">view appointments</p></li>
 <li class="listitem"><p role="presentation">create new appointments on the user’s behalf</p></li>
@@ -58,7 +58,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.html">Managing Appointments</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
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 d9dbe525bfe54263d026a86a520dac3ac8e805bc..c0dcb617aa9a3e79024b0b10767f763c06d1dd22 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
@@ -55,9 +55,9 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.edit.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the pop-up.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.edit.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p></li>
 <li class="listitem">
-<p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.edit.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">Select an appointment in the list view. In the toolbar, click the <span class="guibutton"><strong>Edit</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.edit.toolbar"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p>
 <p role="presentation">You can also double-click on an appointment in the list view. The appointment will be displayed in a window. Click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.edit.editwindow"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p>
 </li>
 </ul></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
index 208939a88f36e7445e9b50279de78c9183794781..8c4273572dcafc916ff490b31711ede59daebd63 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.google.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Subscribing to Google calendars</title>
+<title>subscribe to Google calendars</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <h2 class="sr-only">Adding Calendars</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.folder.google">
-<div class="titlepage"><div><div><h3 class="title">Subscribing to Google calendars</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">subscribe to Google calendars</h3></div></div></div>
 <a class="indexterm" name="id-1.7.14.9.2"></a><a class="indexterm" name="id-1.7.14.9.3"></a><p id="ox.appsuite.user.concept.calendar.folder.google">Depending on the configuration, you can import your Google calendar’s appointments into a groupware calendar by subscribing to your Google calendar.</p>
 <p id="ox.appsuite.user.hint.calendar.folder.google">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -45,7 +45,7 @@
 <p class="title">How to subscribe to your Google calendar:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.google.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 to Google calendar</strong></span>.</p>
+<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.google.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>next to New appointment.Next to a person’s name. Click on <span class="guibutton"><strong>Subscribe to Google calendar</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.google.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 Google calendar</strong></span>.</p>
 </li>
 <li class="step">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
index d7d004f4516ee4adc7d744424561cb1866000559..656d876da992f621ca8011d6fec4953d69b0ce65 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.html
@@ -36,7 +36,7 @@
 <p id="ox.appsuite.user.concept.calendar.folder">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</a></p></li>
-<li class="listitem cap-calendar_google" id="id-1.7.14.5.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">Subscribing to Google calendars</a></p></li>
+<li class="listitem cap-calendar_google" id="id-1.7.14.5.1.2"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
index 1d2ac395834b9fd12864c6cb088ee8651a0f6d36..3ec9e80ecbb86672682b2daa5a7e2cbfbaef4537 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.import.html
@@ -38,7 +38,7 @@
 <p class="title">How to import calendars from a file:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.import.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Import file</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.import.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>next to New appointment.Next to a person’s name. Click on <span class="guibutton"><strong>Import file</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.import.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Import file</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Import from file</strong></span> window opens.</p>
 </li>
@@ -60,7 +60,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.personal.html">Adding personal calendars</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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
 </li></ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
index 8bf8c735ab030582359a6385cd25d6c323484535..dee479195d1f353c2dab7af1e46736b2e71fe408 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.personal.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.calendar.folder.html" title="Adding Calendars">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.html" title="Adding Calendars">
-<link rel="next" href="ox.appsuite.user.sect.calendar.folder.google.html" title="Subscribing to Google calendars">
+<link rel="next" href="ox.appsuite.user.sect.calendar.folder.google.html" title="subscribe to Google calendars">
 <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"> 
@@ -37,7 +37,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.folder.personal">
 <p class="title">How to create a new personal calendar:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.personal.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new calendar</strong></span>.</p></li>
+<li class="step"><p role="presentation">In the folder view, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.personal.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new calendar</strong></span>.</p></li>
 <li class="step"><p role="presentation">Enter a name. In case the new calendar should be a public calendar, enable <span class="guibutton"><strong>Add as public calendar</strong></span>. Click on <span class="guibutton"><strong>Add</strong></span>.</p></li>
 </ol></div>
 </div>
@@ -48,7 +48,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" 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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe 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>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></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 6bde1383ed4fdf2c053450dfe1afee7e5f03ac8c..f3674be4572ade6d89e83db61826559331022d7b 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
@@ -44,7 +44,7 @@
 <p class="title">How to subscribe to external calendars:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Import from url</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>next to New appointment.Next to a person’s name. Click on <span class="guibutton"><strong>Import from url</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribe.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Import from url</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Subscribe to iCal feed</strong></span> window opens.</p>
 </li>
@@ -57,7 +57,7 @@
 <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">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/plus.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/plus.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Refresh this calendar</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">In order to refresh the subscribed data, click the <span class="guibutton"><strong>Action</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/plus.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Refresh this calendar</strong></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.folder.subscribe"></p>
 <p class="title">User interface:</p>
@@ -69,7 +69,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.folder.personal.html">Adding personal calendars</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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.folder.subscribeshared.html
index 671f56245d3abd64ffd1d94c2d091c3ee0da393a..71e8589bd83dd9e0a1c4d3685b6d4c37dad138fb 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
@@ -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.folder.html" title="Adding Calendars">
-<link rel="prev" href="ox.appsuite.user.sect.calendar.folder.google.html" title="Subscribing to Google calendars">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.folder.google.html" title="subscribe to Google calendars">
 <link rel="next" href="ox.appsuite.user.sect.calendar.folder.subscribe.html" title="Subscribing to external calendars from an iCal url">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -46,9 +46,9 @@
 <p class="title">How to define the calendars to which you want to subscribe and which are to be synchronized:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<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">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 New appointment.Next to a person’s name. 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">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.folder.subscribeshared.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Subscribe shared Calendar</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">You can also use the <span class="guibutton"><strong>Subscribe to shared calendars</strong></span> button in the calendar settings.</p></li>
 </ul></p>
 <p role="presentation">A window opens. It shows your private, the public and shared calendars.</p>
@@ -72,7 +72,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.folder.personal.html">Adding personal calendars</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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe to Google calendars</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
index 19d67d4979b3d5ccd621e7ff5aac1974b2732b6c..135bbebf35438176d2b045fc16b4a3e9caf69155 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.groups.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.groups">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Groups</h2></div></div></div>
-<a class="indexterm" name="id-1.7.19.2"></a><p id="ox.appsuite.user.concept.calendar.groups">In case you frequently want to add the same persons to appointments or tasks, you can create a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.group">group</a> consisting of those persons. You can then add the group as participant instead of adding single persons. The following options exist: </p>
+<a class="indexterm" name="id-1.7.19.2"></a><p id="ox.appsuite.user.concept.calendar.groups">In case you frequently want to add the same persons to appointments or tasks, you can create a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.group">group  </a>consisting of those persons. You can then add the group as participant instead of adding single persons. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create a new group</p></li>
 <li class="listitem"><p role="presentation">edit an existing group</p></li>
@@ -43,7 +43,7 @@
 <p class="title">How to create a new group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -61,7 +61,7 @@
 <p class="title">How to edit a group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -78,7 +78,7 @@
 <p class="title">How to delete a group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.remove.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.groups.remove.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
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 d53494c00647e1f722a1c9acf0890b3ca416c2d3..f09ee55323b3537a88867907285c3b0d660245a3 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
@@ -37,8 +37,8 @@
 <p id="ox.appsuite.user.instruction.calendar.gui.create">In order to open the window, do one of the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Click on <span class="guibutton"><strong>New appointment</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.create.edit.list"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the toolbar.</p></li>
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.create.edit.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> in the pop-up.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. In the toolbar, click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.create.edit.list"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>Edit</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.create.edit.popup"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.calendar.gui.create"></p>
 <p class="title">Content</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.detailview.html
index 1b58d3338be7004b83244be1e995000218625fee..13fec45b33d685f0306db52ff69db2fdd5f86ae6 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.detailview.html
@@ -54,7 +54,7 @@
 <li class="listitem cap-switchboard" id="id-1.7.7.14.5.1.3"><p role="presentation">for conferences: a button to join the conference</p></li>
 <li class="listitem">
 <p role="presentation">buttons for changing your confirmation status: <span class="guibutton"><strong>Accept</strong></span>, <span class="guibutton"><strong>Maybe</strong></span>, <span class="guibutton"><strong>Decline</strong></span></p>
-<p role="presentation">If clicking the <span class="guibutton"><strong>More actions</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.detailview.status"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>, a window opens where you can change your confirmation status and add a comment.</p>
+<p role="presentation">If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.detailview.status"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> , a window opens where you can change your confirmation status and add a comment.</p>
 </li>
 <li class="listitem">
 <p role="presentation">Further appointment data, if set: </p>
@@ -96,7 +96,7 @@
 <p role="presentation" class="cap-switchboard"><a class="xref" href="ox.appsuite.user.sect.calendar.call.html">Calling Appointment Participants</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.minicalendar.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.minicalendar.html
index 26514da22c7941ca467a282eb36332f73b0b635e..79679ed30ffd8c4caa6176bcaaaa7e46e07b58dc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.minicalendar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.minicalendar.html
@@ -37,7 +37,7 @@
 <p id="ox.appsuite.user.instruction.calendar.gui.minicalendar">To view the mini calendar, proceed as follows:</p>
 <ol class="orderedlist" type="1">
 <li class="listitem"><p role="presentation">If the folder view is not displayed, click the <span class="guibutton"><strong>Open folder view</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.minicalendar.open"><object type="image/svg+xml" data="../../images/layout-split.svg" height="15"></object></span> on the bottom left side.</p></li>
-<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.gui.minicalendar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Disable <span class="guibutton"><strong>Mini calendar</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.minicalendar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Disable <span class="guibutton"><strong>Mini calendar</strong></span>.</p></li>
 </ol>
 <p>
       </p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.new.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.new.html
index 0b53254587464bed67a7036a78e3245e4a71c56d..1b1a7876587db403109737ccf6fe8a22af657a68 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.new.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">The <span class="phrase">Calendar</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.gui.new">
 <div class="titlepage"><div><div><h3 class="title">The New appointment button</h3></div></div></div>
-<a class="indexterm" name="id-1.7.7.6.2"></a><p id="ox.appsuite.user.concept.calendar.gui.new">Creates a new appointment. If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, a menu with further functions opens: </p>
+<a class="indexterm" name="id-1.7.7.6.2"></a><p id="ox.appsuite.user.concept.calendar.gui.new">Creates a new appointment. The <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> opens a menu with additional functions: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Show scheduling view</p></li>
 <li class="listitem"><p role="presentation">Subscribe to shared calendars, subscribe to or import other calendars</p></li>
@@ -51,7 +51,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe 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>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.popup.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.popup.html
index 553cb0798b2222b5605af01a9fa3991b11ecd98c..cd8e0718216847118d9d4dd8d2ecdf130ed71aec 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.popup.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.popup.html
@@ -89,7 +89,7 @@
 </li>
 <li class="listitem">
 <p role="presentation">buttons for changing your confirmation status: <span class="guibutton"><strong>Accept</strong></span>, <span class="guibutton"><strong>Maybe</strong></span>, <span class="guibutton"><strong>Decline</strong></span></p>
-<p role="presentation">If clicking the <span class="guibutton"><strong>More actions</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.popup.status"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>, a window opens where you can change your confirmation status and add a comment.</p>
+<p role="presentation">If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.popup.status"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> , a window opens where you can change your confirmation status and add a comment.</p>
 </li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.gui.popup"></p>
@@ -110,7 +110,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p>
 <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.move.html">Moving appointments to another calendar</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.scheduling.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.scheduling.html
index cd1b2f3b5245f1382590edf0ac785e72d4cda36e..6671c940b274a68b77ff08724c243818ed02d09a 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.scheduling.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.scheduling.html
@@ -36,13 +36,13 @@
 <a class="indexterm" name="id-1.7.7.15.2"></a><p id="ox.appsuite.user.concept.calendar.gui.scheduling">Shows the appointments of the participants that you add to a scheduled appointment.</p>
 <p id="ox.appsuite.user.instruction.calendar.gui.scheduling">In order to display the scheduling view, do one of the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.scheduling.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> next to <span class="guibutton"><strong>New appointment</strong></span>. Click on <span class="guibutton"><strong>Scheduling</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.scheduling.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>next to New appointment.Next to a person’s name. Click on <span class="guibutton"><strong>Scheduling</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Click on <span class="guibutton"><strong>Find a free time</strong></span> in the appointment editing window.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.calendar.gui.scheduling"></p>
 <p class="title">Content</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">With the <span class="guibutton"><strong>Browse</strong></span> icons <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span> you can browse back and forth.</p></li>
+<li class="listitem"><p role="presentation">The <span class="guibutton"><strong>Browse</strong></span> icons<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.browse"><object type="image/svg+xml" data="../../images/code.svg" height="15"></object></span> enable you to browse back and forth.</p></li>
 <li class="listitem"><p role="presentation">Start and end date of the selected time range and the calendar week. If clicking on it, the date picker opens that allows you to set a different time range.</p></li>
 <li class="listitem"><p role="presentation">Icons for adjusting the zoom ratio for the calendar sheet view</p></li>
 <li class="listitem">
@@ -55,9 +55,9 @@
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Hide non-working time</strong></span>. Defines whether times that are outside the working hours are hidden.</p></li>
 </ul>
 </li>
-<li class="listitem"><p role="presentation">If the scheduling view was opened from the toolbar: <span class="guibutton"><strong>Close</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.participant.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span></p></li>
+<li class="listitem"><p role="presentation">If the scheduling view was opened from the toolbar: <span class="guibutton"><strong>Close</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.participant.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span></p></li>
 <li class="listitem"><p role="presentation">An input field for participants and resources</p></li>
-<li class="listitem"><p role="presentation">A list of participants. The following information are shown for each participant: Name, <span class="guibutton"><strong>Remove</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.participant.remove"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>, appointments in the calendar sheet.</p></li>
+<li class="listitem"><p role="presentation">A list of participants. The following information are shown for each participant: Name, <span class="guibutton"><strong>Remove</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.scheduling.participant.remove"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>, appointments in the calendar sheet.</p></li>
 <li class="listitem"><p role="presentation">The calendar sheet of the selected time range.</p></li>
 <li class="listitem"><p role="presentation">Scrollbar. The scrollbar allows you to set the part of the time range to be displayed.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Save as distribution list</strong></span> button. Saves the added participants in a new distribution list.</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 c75f76674f96d5bb72d79f532b603a27e9b35987..76d8588df608dce2b5d51ede97ebcbf30a22a656 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
@@ -33,7 +33,7 @@
 <h2 class="sr-only">The <span class="phrase">Calendar</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.gui.settingsmenu">
 <div class="titlepage"><div><div><h3 class="title">The Settings menu</h3></div></div></div>
-<a class="indexterm" name="id-1.7.7.5.2"></a><p id="ox.appsuite.user.concept.calendar.gui.settingsmenu">The <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.settingsmenu.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar opens a menu with the following functions: </p>
+<a class="indexterm" name="id-1.7.7.5.2"></a><p id="ox.appsuite.user.concept.calendar.gui.settingsmenu">The <span class="guibutton"><strong>Settings</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.settingsmenu.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar opens a menu with the following functions: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <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>
@@ -53,7 +53,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.gui.toolbar.html">The <span class="phrase">Calendar</span> toolbar</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" 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" class="cap-calendar_google"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.google.html">subscribe 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>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribe.html">Subscribing to external calendars from an iCal url</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
index 0a3b2364419f35008abe1c5202925bc0e061c75e..fa849cb5ed3bde61afddb314f4cdd211dbcdef4f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.gui.toolbar.html
@@ -37,10 +37,11 @@
 <p id="ox.appsuite.user.hint.calendar.gui.toolbar">Note: Some functions are only available if you opened a calendar for which you have the permission to edit appointments.</p>
 <p id="ox.appsuite.user.reference.calendar.gui.toolbar">When having selected one of the calendar views <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span>, <span class="guibutton"><strong>Week</strong></span>, <span class="guibutton"><strong>Month</strong></span>, <span class="guibutton"><strong>Year</strong></span> the following elements will be displayed: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Previous timeframe</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.previous"><object type="image/svg+xml" data="../../images/chevron-left.svg" height="15"></object></span>, <span class="guibutton"><strong>Today</strong></span> button, <span class="guibutton"><strong>Next timeframe</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.next"><object type="image/svg+xml" data="../../images/chevron-right.svg" height="15"></object></span></p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Previous timeframe</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.previous"><object type="image/svg+xml" data="../../images/chevron-left.svg" height="15"></object></span>, <span class="guibutton"><strong>Today</strong></span> button, <span class="guibutton"><strong>Next timeframe</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.next"><object type="image/svg+xml" data="../../images/chevron-right.svg" height="15"></object></span>
+            </p></li>
 <li class="listitem">
 <p role="presentation">Depending on the selected timeframe: current date, current month, current year.</p>
-<p role="presentation">If the <span class="guibutton"><strong>Show mini calendar</strong></span> option has been disabled in the <span class="guibutton"><strong>Settings</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>, the date picker will be displayed when clicking on the current date.</p>
+<p role="presentation">If <span class="guibutton"><strong>Show mini calendar</strong></span> has been disabled in the <span class="guibutton"><strong>Settings</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.gui.toolbar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>  , the date picker will be displayed when clicking on the current date.</p>
 </li>
 <li class="listitem"><p role="presentation">If you have selected the <span class="guibutton"><strong>Day</strong></span> view: <span class="guibutton"><strong>Split</strong></span> button. Displays the calendars selected in the folder view, in separate columns.</p></li>
 <li class="listitem"><p role="presentation">Menu for selecting a view: <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span>, <span class="guibutton"><strong>Week</strong></span>, <span class="guibutton"><strong>Month</strong></span>, <span class="guibutton"><strong>Year</strong></span>, <span class="guibutton"><strong>List</strong></span></p></li>
@@ -65,7 +66,7 @@
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.followup.html">Creating a follow-up appointment</a></p>
 <p role="presentation" class="cap-webmail"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">Inviting participants to a new appointment</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.attendees.html">invite participants to a new appointment</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.edit.html">Editing Appointments</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.invitation.html
index 5b43cd293f11afe2a22a327454725e0392518bfe..aac10a22cf94c9e3107cf3806218a85338c0b544 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
@@ -82,7 +82,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</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">Calendar Settings</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.calendar.invitation">Parent topic: <a class="xref" href="ox.appsuite.user.chap.calendar.html"><i><span class="phrase">Calendar</span></i></a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
index bbdfdbaf0359d20db7ca8cedf36adf3a5ff9da15..6483d3432bc6eab7457754fb1999ce3125dce856 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changeorganizer.html
@@ -43,8 +43,8 @@
 <p class="title">How to change an appointment's organizer:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changeorganizer.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.changeorganizer.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changeorganizer.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.changeorganizer.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p></li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Change organizer</strong></span>.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
index f277272c7500d5dde2759405458ea7a43503732c..de141f114ddd0a9d8eee21d413216e45cded0b25 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changereminder.html
@@ -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.changestatus.html" title="Changing the appointment status">
+<link rel="prev" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="change the appointment status">
 <link rel="next" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html" title="Changing the organizer">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -39,8 +39,8 @@
 <p class="title">How to change an appointment reminder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changereminder.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changereminder.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changereminder.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changereminder.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p></li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Change reminders</strong></span>.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
index 99d1a4b74becf304de830caf84eb5fbea7d6815e..42c58e2c5f2c48e2d2b6074e1b1e99855d5ef255 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.changestatus.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Changing the appointment status</title>
+<title>change the appointment status</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <h2 class="sr-only">Managing Appointments</h2>
 <div class="sect2" id="ox.appsuite.user.sect.calendar.manage.changestatus">
-<div class="titlepage"><div><div><h3 class="title">Changing the appointment status</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">change the appointment status</h3></div></div></div>
 <a class="indexterm" name="id-1.7.15.7.2"></a><a class="indexterm" name="id-1.7.15.7.3"></a><p id="ox.appsuite.user.concept.calendar.manage.changestatus">You can change your appointment status at a later point of time. You can add a comment that is visible to other participants.</p>
 <p id="ox.appsuite.user.hint.calendar.manage.changestatus">Notes: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -49,7 +49,7 @@
 <li class="step"><p role="presentation">Use one of the following methods: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To change the appointment confirmation without comment, click on one of the buttons <span class="guibutton"><strong>Accept</strong></span>, <span class="guibutton"><strong>Maybe</strong></span>, <span class="guibutton"><strong>Decline</strong></span>.</p></li>
 <li class="listitem">
-<p role="presentation">To change the appointment invitation with a comment, click the <span class="guibutton"><strong>Add comment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changestatus.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p>
+<p role="presentation">To change the appointment confirmation with a comment, click the <span class="guibutton"><strong>Add comment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.changestatus.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p>
 <p role="presentation">Select one of the options <span class="guibutton"><strong>Accept</strong></span>, <span class="guibutton"><strong>Maybe</strong></span>, <span class="guibutton"><strong>Decline</strong></span> in the <span class="guilabel"><strong>Change confirmation</strong></span> window. If required, enter a comment.</p>
 </li>
 </ul></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.colors.html
index 1707dffceb5a793a51c108eaa9df72e5fecc803f..4d7a98f129aaf2cdab3ef47019fb33c7dc01c51c 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
@@ -37,7 +37,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.manage.colors">
 <p class="title">How to select a calendar color:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Select a calendar in the folder view. Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.colors"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to the calendar.</p></li>
+<li class="step"><p role="presentation">Select a calendar in the folder view. Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.colors"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>next to the calendar.</p></li>
 <li class="step"><p role="presentation">Select a color from the color selection drop down.</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
index b51f724a3058de670b7347198a7aa5a3230b6866..2ecb9ba40ebb98ca550d4e27db8312ec0ba537e8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.delete.html
@@ -38,8 +38,8 @@
 <p class="title">How to delete appointments:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.delete.popup"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.delete.list"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.delete.popup"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. In the toolbar, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.delete.list"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
 </ul></p></li>
 <li class="step"><p role="presentation">Confirm that you want to delete the appointment.</p></li>
 </ol></div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
index de215fd1de88ee6d542f63884e560d90f139971b..53cd682d3ba46113187cadcde410ae07d5f8ac81 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.export.html
@@ -38,8 +38,8 @@
 <p class="title">How to export single appointments:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.selected.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.selected.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.selected.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.selected.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p></li>
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>Export</strong></span>. A window opens.</p>
@@ -51,7 +51,7 @@
 <p class="title">How to export all appointments from a calendar:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select a personal or public calendar in the folder view.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.folder"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Export</strong></span>. A window opens.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.export.folder"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>next to the calendar. Click on <span class="guibutton"><strong>Export</strong></span>. A window opens.</p></li>
 <li class="step"><p role="presentation">Select the function for saving the export file.</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.html
index 2062c3b86275a34e4a230561e891418a33352cfa..42ca079525c9b486aa72fda14324af50764bae0c 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
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.calendar.html" title="Calendar">
 <link rel="prev" href="ox.appsuite.user.sect.calendar.folder.import.html" title="Importing calendars from files">
-<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="Changing the appointment status">
+<link rel="next" href="ox.appsuite.user.sect.calendar.manage.changestatus.html" title="change the appointment status">
 <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"> 
@@ -34,7 +34,7 @@
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Managing Appointments</h2></div></div></div>
 <a class="indexterm" name="id-1.7.15.2"></a><a class="indexterm" name="id-1.7.15.3"></a><p id="ox.appsuite.user.orientation.calendar.manage">Learn how to organize your appointments and about the appointment actions available. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">Changing the appointment status</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changestatus.html">change the appointment status</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changereminder.html">Changing appointment reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.changeorganizer.html">Changing the organizer</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.timezones.html">Managing favorite timezones</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
index bfcc640609dce1a59900056fcee1ae01541dd55b..401a238cf9bf3233dc51984a219473629fcb8766 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.import.html
@@ -38,7 +38,7 @@
 <p class="title">How to import appointments from an iCal file:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select the calendar for importing the appointments to in the folder view.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.import"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Import</strong></span>.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.import"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>next to the calendar. Click on <span class="guibutton"><strong>Import</strong></span>.</p></li>
 <li class="step">
 <p role="presentation">In the <span class="guilabel"><strong>Import from file</strong></span> window, click on <span class="guibutton"><strong>Upload file</strong></span>. Select a file in iCal format.</p>
 <p role="presentation">To also import appointments that have the same id as already existing appointments, enable <span class="guibutton"><strong>Ignore existing appointments</strong></span>.</p>
@@ -54,7 +54,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.manage.export.html">Exporting appointments</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.import.html">Importing calendars from files</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.calendar.manage.import">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.move.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
index ed4939a639fe85db95efd8f6aae89a747dcf8e58..7c7ecb894a7d388113785199d3dd7af73431cc77 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.move.html
@@ -40,8 +40,8 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.move.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.move.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.move.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment or multiple appointments in the list view. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.move.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p>
 <p role="presentation">Click on <span class="guibutton"><strong>Move</strong></span>.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
index 9016207fd073b9c58610f0a11be49a06cbb4f3e1..5670909363234c11217d6e2aa60933e300692a10 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.manage.print.html
@@ -47,7 +47,7 @@
 <p role="presentation">In the folder view, enable the checkboxes of the calendars which appointments you would like to print.</p>
 <p role="presentation">Select the date range for the appointments to be printed.</p>
 </li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.sheet.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Print</strong></span>. A window with a print preview opens.</p></li>
+<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.sheet.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Print</strong></span>. A window with a print preview opens.</p></li>
 <li class="step"><p role="presentation">If required, change the printer settings. Click on <span class="guibutton"><strong>Print</strong></span>.</p></li>
 <li class="step"><p role="presentation">Close the print preview window.</p></li>
 </ol></div>
@@ -57,8 +57,8 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the view, you have the following possibilities: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.data.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">Select an appointment in the list view. Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.data.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar.</p></li>
+<li class="listitem"><p role="presentation">Click on an appointment in a calendar view. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.data.popup"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Select an appointment in the list view. In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.data.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>.</p></li>
 </ul></p>
 <p role="presentation">Click on <span class="guibutton"><strong>Print</strong></span>. A window with a print preview opens.</p>
 </li>
@@ -71,7 +71,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select <span class="guibutton"><strong>List</strong></span> on the right side of the menu bar.</p></li>
 <li class="step"><p role="presentation">Select the appointments to be printed.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.list.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Print</strong></span>. A window opens. You are asked how you want to print the appointments. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step"><p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.print.list.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Print</strong></span>. A window opens. You are asked how you want to print the appointments. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To print a list with detailed appointment data, click on <span class="guibutton"><strong>Detailed</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">To print a compact list, click on <span class="guibutton"><strong>Compact</strong></span>.</p></li>
 </ul></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 6bfa2ed486f6c276b080a4d9257658d3a212ee85..3dc005b2f8deafccab5f77985eb189fc0f0e5c41 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
@@ -38,7 +38,7 @@
 <p class="title">How to mark a timezone as favorite:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.timezones.favorites.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.manage.timezones.favorites.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Calendar</strong></span> in the left pane. Click on <span class="guibutton"><strong>Favorite timezones</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
index 9f926a97c2f0b8ba8220d47e03b864dacac38c66..363da4801075070cf0a8ae0888a49c6127b8f6e1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.add.html
@@ -38,7 +38,7 @@
 <p class="title">How to create a managed resource:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.managedresources.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.managedresources.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
index 02db95b2266d413058787b074507d5a6e358d904..426b69b210b96012c726055079e924537b250985 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.managedresources.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.managedresources">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Managed Resources</h2></div></div></div>
-<a class="indexterm" name="id-1.7.21.2"></a><a class="indexterm" name="id-1.7.21.3"></a><p id="ox.appsuite.user.concept.calendar.managedresources">In contrast to regular resources, a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.managedresource">managed resource</a> will only be booked if a resource delegate confirms the booking. The following options exist: </p>
+<a class="indexterm" name="id-1.7.21.2"></a><a class="indexterm" name="id-1.7.21.3"></a><p id="ox.appsuite.user.concept.calendar.managedresources">In contrast to a common resource, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.managedresource">managed resources </a>will only be booked when having been confirmed by a booking delegate. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.add.html">Creating managed resources</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.calendar.managedresources.administer.html">Administrating managed resources as booking delegate</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
index 82dba8cee3f752f344560e31819fe251d4776659..f1015bed8b86ad0bb281c0e0ff60c20ee410a176 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.add.html
@@ -37,7 +37,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">For each resource, a resource calendar will be created.</p>
-<p role="presentation">The list of available resources depends on the configuration that allows administrators or specific users to <a class="link" href="ox.appsuite.user.sect.calendar.resources.html">manage resources</a>.</p>
+<p role="presentation">The list of available resources depends on the configuration that allows administrators or specific users to <a class="link" href="ox.appsuite.user.sect.calendar.resources.html">manage resources.</a> </p>
 </li>
 <li class="listitem"><p role="presentation">Resource calendars will be displayed at the bottom of the folder view within resource calendar groups.</p></li>
 <li class="listitem"><p role="presentation">You can create and edit own resource calendar groups or use the default resource calendar group.</p></li>
@@ -52,7 +52,7 @@
 <p class="title">How to create a resource calendar in the default resource calendar group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.add.folder.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new resource calendar</strong></span>.</p>
+<p role="presentation">In the folder view, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.add.folder.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new resource calendar</strong></span>.</p>
 <p role="presentation">The <span class="guibutton"><strong>Select resources</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Select at least one resource. Click on <span class="guibutton"><strong>Select</strong></span>.</p></li>
@@ -65,7 +65,7 @@
 <p class="title">How to create a new resource calendar group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.add.group.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new resource calendar group</strong></span>.</p>
+<p role="presentation">In the folder view, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.add.group.actions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span>next to <span class="guibutton"><strong>My calendars</strong></span> in the folder view. Click on <span class="guibutton"><strong>Add new resource calendar group</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Add new resource calendar group</strong></span> window opens.</p>
 </li>
 <li class="step">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
index 74cf7cc9fd2a19ca08cfc4e23894493877bdda00..284575548e38264188763aa51513b688b25b1053 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.edit.html
@@ -55,7 +55,7 @@
 <div class="task" id="ox.appsuite.user.task.calendar.resourcecalendar.edit.removegroup">
 <p class="title">How to delete a resource calendar group:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.edit.removegroup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to a resource calendar group in the folder view.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.edit.removegroup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar group in the folder view.</p></li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Delete resource group</strong></span>. Confirm the deletion.</p></li>
 </ol></div>
 </div>
@@ -65,7 +65,7 @@
           <p>Note: If you delete a resource calendar, it will be deleted in all resource calendar groups that contain that calendar.</p>
         </div>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.edit.removeresource.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to a resource calendar in the folder view.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.edit.removeresource.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>  next to a resource calendar in the folder view.</p></li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Remove resource calendar</strong></span>. Confirm the deletion.</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
index a9ef9e9b5b423577436b7bb1b0b3e9987624366b..48c32704034d28b56c7be3559a078b4670fd55af 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.resourcecalendar">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Resource Calendars</h2></div></div></div>
-<a class="indexterm" name="id-1.7.16.2"></a><a class="indexterm" name="id-1.7.16.3"></a><a class="indexterm" name="id-1.7.16.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar">To check whether a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> is available or has already been booked for an appointment, you can use resource calendars. </p>
+<a class="indexterm" name="id-1.7.16.2"></a><a class="indexterm" name="id-1.7.16.3"></a><a class="indexterm" name="id-1.7.16.4"></a><p id="ox.appsuite.user.concept.calendar.resourcecalendar">To check whether a <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource </a>is available or has already been booked for an appointment, you can use resource calendars. </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">A resource calendar shows all appointments for which the resource has been booked.</p></li>
 <li class="listitem"><p role="presentation">You can create resource calenders by using the resource list.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
index c45a23fb270f537cd1e7854cd7238d8a472bdcc5..4134159d56b670b54e92a603feb5b2e116bef487 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resourcecalendar.view.html
@@ -46,7 +46,7 @@
 <p role="presentation">To show or hide the appointments of other calendars, enable or disable the checkboxes next to the respective calendars.</p>
 </li>
 <li class="step">
-<p role="presentation">To only display the appointments of a single resource calendar, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.resource.actions.hide"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar in the folder view. Click on <span class="guibutton"><strong>Show this resource only</strong></span>.</p>
+<p role="presentation">To only display the appointments of a single resource calendar, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.resource.actions.hide"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar in the folder view. Click on <span class="guibutton"><strong>Show this resource only</strong></span>.</p>
 <p role="presentation">In order to display the previously shown calendars again, do one of the following: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Click on a calendar in the folder view.</p></li>
 <li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.resource.actions.show"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar in the folder view. Click on <span class="guibutton"><strong>Show all calendars</strong></span>.</p></li>
@@ -58,7 +58,7 @@
 <p class="title">How to only display the appointments of a resource calendar group:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.hide"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar group in the folder view. Click on <span class="guibutton"><strong>Show this group only</strong></span>.</p></li>
-<li class="step"><p role="presentation">To display the previously shown appointments again, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.show"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar group in the folder view. Click on <span class="guibutton"><strong>Show all calendars</strong></span>.</p></li>
+<li class="step"><p role="presentation">To display the previously shown appointments again, click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon   <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resourcecalendar.view.group.actions.show"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the resource calendar group in the folder view. Click on <span class="guibutton"><strong>Show all calendars</strong></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.calendar.resourcecalendar.view"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
index 316281ad6af450fea727226bc9e6080e9e80d053..86f39b4cd44a8ee58f140c9892adbe66a1861d8b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.resources.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Calendar</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.calendar.resources">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Using Resources</h2></div></div></div>
-<a class="indexterm" name="id-1.7.20.2"></a><p id="ox.appsuite.user.concept.calendar.resources">Other than participant conflicts, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource</a> conflicts can not be ignored when creating appointments. If creating appointments, resources that are already booked for other appointments can not be added. The following options exist: </p>
+<a class="indexterm" name="id-1.7.20.2"></a><p id="ox.appsuite.user.concept.calendar.resources">Other than participant conflicts, <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.resource">resource  </a>conflicts can not be ignored when creating appointments. If creating appointments, resources that are already booked for other appointments can not be added. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create new resources</p></li>
 <li class="listitem"><p role="presentation">edit existing resources</p></li>
@@ -43,7 +43,7 @@
 <p class="title">How to create a new resource:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.add.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -61,7 +61,7 @@
 <p class="title">How to edit a resource:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -78,7 +78,7 @@
 <p class="title">How to delete a resource:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.remove.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.resources.remove.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
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 a627841ca8035ecfb1143313b52df69e1790d8e3..097bfdf50b977d00c3f2738796c7a65269b1b87c 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
@@ -59,7 +59,7 @@
 <li class="listitem"><p role="presentation">If participants match the search term, those participants will be suggested below the search field. To search for appointments that contain one of those contacts as participant, click on the contact.</p></li>
 </ul></p></li>
 <li class="step">
-<p role="presentation">You can use further filters by clicking the <span class="guibutton"><strong>More search options</strong></span>  icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the search field. A window with search options opens. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">You can use further filters by clicking the <span class="guibutton"><strong>More search options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>  in the search field. A window with search options opens. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">To search for appointments with specific features, enter a search term in at least one input field.</p></li>
 <li class="listitem"><p role="presentation">To limit the search to appointments within a specific time frame, use <span class="guibutton"><strong>After</strong></span> and <span class="guibutton"><strong>Before</strong></span>.</p></li>
 </ul></p>
@@ -70,8 +70,8 @@
         <p>The search results will be displayed in the list view.</p>
         <p>The filters used are displayed below the search window. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">You can add filters and start a new search by clicking the <span class="guibutton"><strong>More search options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the search field.</p></li>
-<li class="listitem"><p role="presentation">You can remove a filter and start a new search by clicking the <span class="guibutton"><strong>Remove filter</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the filter.</p></li>
+<li class="listitem"><p role="presentation">You can add filters and start a new search by clicking the <span class="guibutton"><strong>More search options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>  in the search field.</p></li>
+<li class="listitem"><p role="presentation">You can remove a filter and start a new search by clicking the <span class="guibutton"><strong>Remove filter</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>  next to the filter.</p></li>
 </ul>
         <p>In order to finish the search, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.search.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</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 a9556ac066d8382df5120b59ddf181a89e2bb84f..9082291f25a11b67070c3e1e0b85897a95db1cbb 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
@@ -36,7 +36,7 @@
 <p class="title">How to use the calendar settings:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
@@ -114,8 +114,8 @@
 <p><a class="indexterm" name="id-1.7.22.13.2"></a>Defines whether a countdown window will be displayed for upcoming appointments. Also see <a class="xref" href="ox.appsuite.user.sect.settings.countdown.html">Use countdown for appointments</a></p>
 </div>
 <p id="ox.appsuite.user.reference.calendar.settings.hidefreebusy"></p>
-<h3 class="title">Hide free&amp;busy</h3>
-<p><a class="indexterm" name="id-1.7.22.14.2"></a>Defines whether your appointments will be displayed in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
+<h3 class="title">Free/Busy visibility</h3>
+<p><a class="indexterm" name="id-1.7.22.14.2"></a>Defines which users can view your appointments in the scheduling view. Also see <a class="xref" href="ox.appsuite.user.sect.calendar.add.scheduling.html">Using the scheduling view</a></p>
 <p id="ox.appsuite.user.related.calendar.settings"></p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
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 83c78447f67eddcad1891ea001e8931763f0c86d..6ca790ae02286122fcf84e3b922c7a9e7d2d62e5 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
@@ -59,23 +59,23 @@
 <li class="listitem"><p role="presentation">A confirmed appointment that is displayed as Free is displayed in its appointment color and hatched.</p></li>
 <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">An appointment that you have declined will be displayed in gray. The subject is preceded by the <span class="guibutton"><strong>Declined</strong></span> icon <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> . The subject is crossed out.</p>
 <p role="presentation">In the calendar settings, you can define whether declined appointments will be displayed.</p>
 </li>
-<li class="listitem"><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>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.7.8.9.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>   icon <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> .</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.private"></p>
 <h4 class="title">Private appointment display</h4>
 <p>For the display of private appointments, the following also applies: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Private appointments are marked with the <span class="guibutton"><strong>Private</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.private"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Private appointments are marked with the <span class="guibutton"><strong>Private</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.private"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span> .</p></li>
 <li class="listitem"><p role="presentation">In a shared calendar, the private appointment is visible to all participants. All other users will only see the private appointment’s date, but no other appointment data.</p></li>
 </ul>
 <p id="ox.appsuite.user.concept.calendar.view.appointments.secret"></p>
 <h4 class="title">Secret appointment display</h4>
 <p>For the display of secret appointments, the following also applies: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">Secret appointments are marked with the <span class="guibutton"><strong>Secret</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.secret"><object type="image/svg+xml" data="../../images/person-circle.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">Secret appointments are marked with the <span class="guibutton"><strong>Secret</strong></span> icon  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.secret"><object type="image/svg+xml" data="../../images/person-circle.svg" height="15"></object></span> .</p></li>
 <li class="listitem"><p role="presentation">In a shared calendar, the secret appointment is visible to all participants. For all other users, the secret appointment is invisible</p></li>
 <li class="listitem"><p role="presentation">Secret appointments are not considered for the conflict handling. It is not displayed in the scheduling view.</p></li>
 </ul>
@@ -89,7 +89,7 @@
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.secret"><object type="image/svg+xml" data="../../images/eye-slash.svg" height="15"></object></span> secret appointment</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.unconfirmed"><object type="image/svg+xml" data="../../images/question-circle.svg" height="15"></object></span> unconfirmed appointment</p></li>
 <li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.rejected"><object type="image/svg+xml" data="../../images/x-circle.svg" height="15"></object></span> declined appointment</p></li>
-<li class="listitem"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> appointment declined by all other participants</p></li>
+<li class="listitem feat-io-ox-core-implicitCancel" id="id-1.7.8.9.9.2.1.7"><p role="presentation"><span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.appointments.icons.othersdeclined"><object type="image/svg+xml" data="../../images/exclamation-circle-fill.svg" height="15"></object></span> appointment declined by all other participants</p></li>
 </ul>
 <p id="ox.appsuite.user.related.calendar.view.appointments"></p>
 <p class="title">Related topics:</p>
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 b87f4e3243d48cc657391d77cb06152c2ac6382c..facce53d13de5212149a4827eb676ee76a67cb74 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
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one of the following views on the right side of the toolbar: <span class="guibutton"><strong>Day</strong></span>, <span class="guibutton"><strong>Work week</strong></span> or <span class="guibutton"><strong>Week</strong></span>.</p></li>
 <li class="step">
-<p role="presentation">Click on the <span class="guibutton"><strong>Timezone</strong></span> button <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.timezones.timezonebutton"><object type="image/svg+xml" data="../../images/caret-down.svg" height="15"></object></span> on the upper left side of the calendar sheet.</p>
+<p role="presentation">Click on the <span class="guibutton"><strong>Timezone</strong></span> button<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.timezones.timezonebutton"><object type="image/svg+xml" data="../../images/caret-down.svg" height="15"></object></span>on the left side above the calendar sheet.</p>
 <p role="presentation">A menu opens. Enable a timezone in the menu below <span class="guibutton"><strong>Favorites</strong></span>.</p>
 <p role="presentation">By clicking on <span class="guibutton"><strong>Manage favorites</strong></span> you can add/remove timezones to/from favorites.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.views.html b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.views.html
index 73a9d3f401f23e3a9793b14b0c4d7a3f658fcf63..f9529e05d87c0c85366d1e6db286a70ed7e9d101 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.views.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.calendar.view.views.html
@@ -69,7 +69,7 @@
 <p role="presentation">Double-click on the calendar in the folder view.</p>
 <p role="presentation">To display the previously displayed calendars again, double-click on this calendar again.</p>
 </li>
-<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.views.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the calendar. Click on <span class="guibutton"><strong>Show this calendar only</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.calendar.view.views.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the calendar. Click on <span class="guibutton"><strong>Show this calendar only</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">Disable the checkboxes next to the other calendars.</p></li>
 </ul>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.navigate.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.navigate.html
index b07a524f787a4be547de7dbfd454bf2c5a8ca7a0..4c5931471797582cf5ee455c1b5e92b12555e105 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.navigate.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.folder.navigate.html
@@ -78,7 +78,7 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-contacts"><a class="xref" href="ox.appsuite.user.sect.contacts.view.addressbook.html">Displaying an address book’s contacts</a></p></li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-tasks"><a class="xref" href="ox.appsuite.user.sect.tasks.view.html">Viewing Tasks</a></p></li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p>
 <p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
index 5acd769fe94406b0483290db31ca00cb145a0a9e..ca43d809e855c679add517e653a1b386f7239378 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.dataorganisation.sharing.consume.html
@@ -66,7 +66,7 @@
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.folder.subscribeshared.html">Subscribing to public and shared calendars</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.contacts.folder.subscribeshared.html">Subscribing to public and shared address books</a></p>
 <p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.tasks.folder.subscribeshared.html">subscribe to public and shared task lists</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">Subscribing to public and shared <span class="phrase">Drive</span> folders</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.dataorganisation.sharing.consume">Parent topic: <a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.download.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.download.html
index 343d1d516d6084a2f610f97bda5c44c71fe86367..b73f68643a7d001e0baf5531777d3080b4f80ded 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.download.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.download.html
@@ -53,7 +53,7 @@
 <li class="step"><p role="presentation">Complete the steps for downloading the folder.</p></li>
 </ol></div>
 <div class="taskrelated">  
-        <p>Tip: Learn how to download a certain file version by reading <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">the section called “Working with versions”</a>.</p>
+        <p>Tip: Learn how to download a certain file version by reading <a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">the section called “work with versions”</a>.</p>
       </div>
 </div>
 <div class="task" id="ox.appsuite.user.task.drive.downloadfolder">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.html
index ac5f017f59fa989d3654ade895cd0c247fa25f7f..456f29ea2f92278f010a293c4e78b7799c350f83 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.html
@@ -36,7 +36,7 @@
 <a class="indexterm" name="id-1.10.10.2"></a><a class="indexterm" name="id-1.10.10.3"></a><p id="ox.appsuite.user.orientation.drive.folder">Learn how to create personal <span class="phrase">Drive</span> folders and how to set the view for shared <span class="phrase">Drive</span> folders: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: creating folders</a></p></li>
-<li class="listitem"><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></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.drive.folder"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
index e61075939894c8d37d7d16aef120706c36b5c0b8..e050873eb010c0e0511fda620ed2e98f225a5058 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.personal.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.drive.folder.html" title="Drive: Adding Folders">
 <link rel="prev" href="ox.appsuite.user.sect.drive.folder.html" title="Drive: Adding Folders">
-<link rel="next" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html" title="Subscribing to public and shared Drive folders">
+<link rel="next" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html" title="subscribe to public and shared Drive folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -57,7 +57,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.html">Organizing Files and <span class="phrase">Drive</span> Folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.search.html">Searching for Files or Folders</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.subscribeshared.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.subscribeshared.html
index 8bfeced21353e2deec4d0e03b12154cd149b6eda..9cd7b5b178df17a9d96f72abc2655b966b591add 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.subscribeshared.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.folder.subscribeshared.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Subscribing to public and shared Drive folders</title>
+<title>subscribe to public and shared Drive folders</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.drive.folder.html" title="Drive: Adding Folders">
 <link rel="prev" href="ox.appsuite.user.sect.drive.folder.personal.html" title="Drive: creating folders">
-<link rel="next" href="ox.appsuite.user.sect.drive.upload.html" title="Uploading Files or Folders">
+<link rel="next" href="ox.appsuite.user.sect.drive.upload.html" title="Upload files or folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -33,7 +33,7 @@
 <h2 class="sr-only">
 <span class="phrase">Drive</span>: Adding Folders</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.folder.subscribeshared">
-<div class="titlepage"><div><div><h3 class="title">Subscribing to public and shared <span class="phrase">Drive</span> folders</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">subscribe to public and shared <span class="phrase">Drive</span> folders</h3></div></div></div>
 <a class="indexterm" name="id-1.10.10.8.2"></a><a class="indexterm" name="id-1.10.10.8.3"></a><p id="ox.appsuite.user.concept.drive.folder.subscribeshared">You can define which public and shared <span class="phrase">Drive</span> folders are displayed in the folder view by subscribing to such folders.</p>
 <div class="task" id="ox.appsuite.user.task.drive.folder.subscribeshared">
 <p class="title">How to define the <span class="phrase">Drive</span> folders you want to subscribe to:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.content.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.content.html
index d8fbdb05a1033515c5db0a52e059087248242776..1746e59d2a4021aa8ff9c119d5453e0380ee2f19 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.content.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.content.html
@@ -66,7 +66,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.details.html">The file details</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.details.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.details.html
index e582ab0a88a7f6e5286649f22d2117ab438eae8e..23a44d091f9b143319b250fd72bc981e7c06924d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.details.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.details.html
@@ -90,12 +90,12 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.viewer.html">The viewer</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></p>
 </li>
 </ul>
 <p id="ox.appsuite.user.parent.drive.gui.details">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">Drive</span> Components</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.foldertree.html
index 4cc53324dc06579873160437bceec4cef3960011..08b4e21687a4c0710109d961c472cce744ba4e0c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.foldertree.html
@@ -59,12 +59,12 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in <span class="phrase">Drive</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.personal.html"><span class="phrase">Drive</span>: creating folders</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.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.html">Managing Data with Folders</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.navbar.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.navbar.html
index 7fb6d0d6c0621bf03d87e5c166673178b4054dfc..1890cb7565d6b181ea475c55beeaf39495c9d924 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.navbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.navbar.html
@@ -54,7 +54,7 @@
 <p id="ox.appsuite.user.related.drive.gui.navbar"></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.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.drive.gui.navbar">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.gui.html">The <span class="phrase">Drive</span> Components</a></p>
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 a9c7206139f6314dcc07cf00d162188b73fc3f63..2f1c7c641d74ded4f259168eff8fb20c6dccc988 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
@@ -54,7 +54,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.content.html">The <span class="phrase">Drive</span> display area</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.details.html">The file details</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.drive.folder.subscribeshared.html">subscribe to public and shared <span class="phrase">Drive</span> folders</a></p>
 </li>
 <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></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.toolbar.html
index e9e538d44d7c6b20c5c52a4c3700d4b82eedcec3..a48af3d3af1bcc9e8ec0daba4304a66e0208f9e0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.toolbar.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.toolbar.html
@@ -61,9 +61,9 @@
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.viewer.html">The viewer</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.folder.html"><span class="phrase">Drive</span>: Adding Folders</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.text.html">Creating or Editing Text Files</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
@@ -78,7 +78,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or <span class="phrase">Drive</span> folders to Favorites</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or <span class="phrase">Drive</span> folders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a></p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.viewer.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.viewer.html
index b300e6a70c36408878f16e86a8cde3399679c620..9fe6dc04becea18473ba01779dbd85ad4b02a282 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.viewer.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.gui.viewer.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.drive.gui.html" title="The Drive Components">
 <link rel="prev" href="ox.appsuite.user.sect.drive.gui.details.html" title="The file details">
-<link rel="next" href="ox.appsuite.user.sect.drive.view.html" title="Viewing Files">
+<link rel="next" href="ox.appsuite.user.sect.drive.view.html" title="view files">
 <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"> 
@@ -82,7 +82,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.gui.details.html">The file details</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a></p>
 </li>
@@ -91,7 +91,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.editdescription.html">Creating or editing descriptions</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.saveaspdf.html">Saving files as PDF</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.printaspdf.html">Printing files as PDF</a></p>
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></p>
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation" class="cap-share_links cap-share_mail_attachments"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.sharing.html">Sharing Data</a></p></li>
 </ul>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.html
index d910f34fd36bfe8c6a8b2287a7e71be1a4a8c1b6..6a2e78e51e43e3ac2a2f6dad9499827b3e4e9f7b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.html
@@ -45,7 +45,7 @@
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.favorite.html">Adding files or <span class="phrase">Drive</span> folders to Favorites</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.delete.html">Deleting files or <span class="phrase">Drive</span> folders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.lock.html">Locking or unlocking files</a></p></li>
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">Working with versions</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.drive.manage"></p>
 <p class="title">Related topics:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.lock.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.lock.html
index bf63f397ac7f22dd220c89276e075b0a3a1b7714..952f32b645ef6ba5bc4b3137af9f5e940a55873c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.lock.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.lock.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.sect.drive.manage.html" title="Organizing Files and Drive Folders">
 <link rel="prev" href="ox.appsuite.user.sect.drive.manage.delete.html" title="Deleting files or Drive folders">
-<link rel="next" href="ox.appsuite.user.sect.drive.manage.versions.html" title="Working with versions">
+<link rel="next" href="ox.appsuite.user.sect.drive.manage.versions.html" title="work with versions">
 <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.manage.versions.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.versions.html
index dbbad31c1ef77a24cc4980dcd071d5719ae0bb8f..e2eb54631c4f876aff3e196d4ddc3a8930d1bb2b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.versions.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.manage.versions.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Working with versions</title>
+<title>work with versions</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>
 <h2 class="sr-only">Organizing Files and <span class="phrase">Drive</span> Folders</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.manage.versions">
-<div class="titlepage"><div><div><h3 class="title">Working with versions</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">work with versions</h3></div></div></div>
 <a class="indexterm" name="id-1.10.13.19.2"></a><a class="indexterm" name="id-1.10.13.19.3"></a><a class="indexterm" name="id-1.10.13.19.4"></a><p id="ox.appsuite.user.concept.drive.manage.versions">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">open or save the current version</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.search.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.search.html
index b8a4b9fd0a9cf60fa2ecd9c936771c4b0695c932..8b421d82514f1591d4404435e581dc0ea0414844 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.search.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.search.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.drive.html" title="Drive">
-<link rel="prev" href="ox.appsuite.user.sect.drive.manage.versions.html" title="Working with versions">
+<link rel="prev" href="ox.appsuite.user.sect.drive.manage.versions.html" title="work with versions">
 <link rel="next" href="ox.appsuite.user.sect.drive.webdav.html" title="Accessing Files with WebDAV">
 <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.drive.settings.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.settings.html
index b2643f2dc41c4d119a5d04fa18ae06f24c82f88b..37dcef09741b6679a0db54015c2c8c438e68886c 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
@@ -57,11 +57,11 @@
 <li class="listitem"><p><b>Add separate file. </b>A new file will be added. The file name is enhanced with a consecutive number.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.drive.settings.common.playdiashow"></p>
-<h3 class="title">Slideshow / autoplay mode for images</h3>
+<h3 class="title">slideshow / autoplay mode for images</h3>
 <p><a class="indexterm" name="id-1.10.17.7.2"></a>Defines how to present pictures that are displayed in the viewer</p>
 <p id="ox.appsuite.user.reference.drive.settings.extended"></p>
 <h3 class="title">Advanced settings</h3>
-<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.extended.showhiddenobjects"><b>Show hidden files and folders. </b><a class="indexterm" name="id-1.10.17.8.2.1.1.1.2"></a>Defines whether hidden files and folders are displayed. The names of hidden files and folders are preceded by a dot. The local <span class="phrase">Drive</span> apps require such files and folders for internal purposes. In order to not endanger the functionality of the local <span class="phrase">Drive</span> apps, such hidden files and folders must not be changed or deleted.</p></li></ul>
+<ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p id="ox.appsuite.user.reference.drive.settings.extended.showhiddenobjects"><b>show hidden files and folders. </b><a class="indexterm" name="id-1.10.17.8.2.1.1.1.2"></a>Defines whether hidden files and folders are displayed. The names of hidden files and folders are preceded by a dot. The local <span class="phrase">Drive</span> apps require such files and folders for internal purposes. In order to not endanger the functionality of the local <span class="phrase">Drive</span> apps, such hidden files and folders must not be changed or deleted.</p></li></ul>
 <p id="ox.appsuite.user.reference.drive.settings.versionhistory"></p>
 <h3 class="title">Version history</h3>
 <p><a class="indexterm" name="id-1.10.17.9.2"></a>Depending on the configuration, you can define the number of file versions that should be kept for a specific timeframe set by you. If the maximum timeframe or number is reached, older versions are deleted upon creation of a new version. </p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.text.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.text.html
index 64482ac736fb0a8a487fafa6b61ea22a394c1cc3..898f29d46e7f1cc44ecc177262276fdd19a2a1df 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.text.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.text.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.drive.html" title="Drive">
-<link rel="prev" href="ox.appsuite.user.sect.drive.upload.html" title="Uploading Files or Folders">
+<link rel="prev" href="ox.appsuite.user.sect.drive.upload.html" title="Upload files or folders">
 <link rel="next" href="ox.appsuite.user.sect.drive.manage.html" title="Organizing Files and Drive Folders">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.upload.html
index b95a57bf4d67fd807f2838b7aa0c3b5871fc9cfd..28fa9288f6112fd80457668116b6699e2b171f80 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
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Uploading Files or Folders</title>
+<title>Upload files or folders</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.drive.html" title="Drive">
-<link rel="prev" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html" title="Subscribing to public and shared Drive folders">
+<link rel="prev" href="ox.appsuite.user.sect.drive.folder.subscribeshared.html" title="subscribe to public and shared Drive folders">
 <link rel="next" href="ox.appsuite.user.sect.drive.text.html" title="Creating or Editing Text Files">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -31,7 +31,7 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.drive.upload">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Uploading Files or Folders</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Upload files or folders</h2></div></div></div>
 <a class="indexterm" name="id-1.10.11.2"></a><a class="indexterm" name="id-1.10.11.3"></a><a class="indexterm" name="id-1.10.11.4"></a><a class="indexterm" name="id-1.10.11.5"></a><a class="indexterm" name="id-1.10.11.6"></a><p id="ox.appsuite.user.orientation.drive.upload">You can upload local files or folders to the current <span class="phrase">Drive</span> folder.</p>
 <div class="task" id="ox.appsuite.user.task.drive.upload.file">
 <p class="title">How to upload files:</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.attachments.html
index bd5867a37f1df760c069acbabcc44cd66a79a44b..083be99316e59e1df89ac05e5ce1e99de099b88b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.attachments.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="Viewing Files">
+<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="view files">
 <link rel="prev" href="ox.appsuite.user.sect.drive.view.content.html" title="Displaying a file's content">
 <link rel="next" href="ox.appsuite.user.sect.drive.view.presentation.html" title="Holding a presentation">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
-<h2 class="sr-only">Viewing Files</h2>
+<h2 class="sr-only">view files</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.view.attachments">
 <div class="titlepage"><div><div><h3 class="title">Displaying email attachments in <span class="phrase">Drive</span>
 </h3></div></div></div>
@@ -59,7 +59,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.download.html">Downloading Files or Folder Contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.attachments.html">Viewing or Saving Email Attachments</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.drive.view.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p>
+<p id="ox.appsuite.user.parent.drive.view.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.content.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.content.html
index 2f2251a6d8fa56c6eaae328b44bb405cd39924f1..ab989b1b7d69fcc0696ccbf4f47e0dd6df16780f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.content.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.content.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="Viewing Files">
-<link rel="prev" href="ox.appsuite.user.sect.drive.view.objects.html" title="Viewing Drive folder contents">
+<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="view files">
+<link rel="prev" href="ox.appsuite.user.sect.drive.view.objects.html" title="view Drive folder contents">
 <link rel="next" href="ox.appsuite.user.sect.drive.view.attachments.html" title="Displaying email attachments in Drive">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
-<h2 class="sr-only">Viewing Files</h2>
+<h2 class="sr-only">view files</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.view.content">
 <div class="titlepage"><div><div><h3 class="title">Displaying a file's content</h3></div></div></div>
 <a class="indexterm" name="id-1.10.8.8.2"></a><a class="indexterm" name="id-1.10.8.8.3"></a><a class="indexterm" name="id-1.10.8.8.4"></a><a class="indexterm" name="id-1.10.8.8.5"></a><p id="ox.appsuite.user.concept.drive.view.content">The following options exist: </p>
@@ -84,14 +84,14 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.download.html">Downloading Files or Folder Contents</a></p>
 <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" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigating within the folder structure</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.drive.view.content">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p>
+<p id="ox.appsuite.user.parent.drive.view.content">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.html
index 305e7ac2e6acac22e346b29fc75255aec8f77ebf..5bbb03c8584e7752e494c445c369fba26cc2b9a1 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Viewing Files</title>
+<title>view files</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.drive.html" title="Drive">
 <link rel="prev" href="ox.appsuite.user.sect.drive.gui.viewer.html" title="The viewer">
-<link rel="next" href="ox.appsuite.user.sect.drive.view.objects.html" title="Viewing Drive folder contents">
+<link rel="next" href="ox.appsuite.user.sect.drive.view.objects.html" title="view Drive folder contents">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -31,10 +31,10 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.drive.view">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Viewing Files</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">view files</h2></div></div></div>
 <a class="indexterm" name="id-1.10.8.2"></a><a class="indexterm" name="id-1.10.8.3"></a><a class="indexterm" name="id-1.10.8.4"></a><p id="ox.appsuite.user.orientation.drive.view">Learn how to display various files, documents or pictures in different ways: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">Viewing <span class="phrase">Drive</span> folder contents</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.objects.html">view <span class="phrase">Drive</span> folder contents</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.content.html">Displaying a file's content</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in <span class="phrase">Drive</span></a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.presentation.html">Holding a presentation</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.objects.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.objects.html
index 8f5253b71f4ce86f6e3b2a9ae902da41ac4901f8..d096993d1188b3e5a0a2663c09dbfb141510ffaa 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.objects.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.objects.html
@@ -1,12 +1,12 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Viewing Drive folder contents</title>
+<title>view Drive folder contents</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.drive.view.html" title="Viewing Files">
-<link rel="prev" href="ox.appsuite.user.sect.drive.view.html" title="Viewing Files">
+<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="view files">
+<link rel="prev" href="ox.appsuite.user.sect.drive.view.html" title="view files">
 <link rel="next" href="ox.appsuite.user.sect.drive.view.content.html" title="Displaying a file's content">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,9 +30,9 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
-<h2 class="sr-only">Viewing Files</h2>
+<h2 class="sr-only">view files</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.view.objects">
-<div class="titlepage"><div><div><h3 class="title">Viewing <span class="phrase">Drive</span> folder contents</h3></div></div></div>
+<div class="titlepage"><div><div><h3 class="title">view <span class="phrase">Drive</span> folder contents</h3></div></div></div>
 <a class="indexterm" name="id-1.10.8.7.2"></a><a class="indexterm" name="id-1.10.8.7.3"></a><p id="ox.appsuite.user.orientation.drive.view.objects">Learn how to display a <span class="phrase">Drive</span> folder’s files and subfolders in different layouts.</p>
 <div class="task" id="ox.appsuite.user.task.drive.view.objects">
 <p class="title">How to display a <span class="phrase">Drive</span> folder’s objects:</p>
@@ -78,7 +78,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.folder.navigate.html">Navigating within the folder structure</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.drive.view.objects">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p>
+<p id="ox.appsuite.user.parent.drive.view.objects">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.presentation.html b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.presentation.html
index 9a3d64529c627a7e2f2027c49c20529b7207c543..b0aa2737316a6152ef8964514e4402cc4ead51d8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.drive.view.presentation.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.drive.view.presentation.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="Viewing Files">
+<link rel="up" href="ox.appsuite.user.sect.drive.view.html" title="view files">
 <link rel="prev" href="ox.appsuite.user.sect.drive.view.attachments.html" title="Displaying email attachments in Drive">
 <link rel="next" href="ox.appsuite.user.sect.drive.download.html" title="Downloading Files or Folder Contents">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Drive</span></h1>
-<h2 class="sr-only">Viewing Files</h2>
+<h2 class="sr-only">view files</h2>
 <div class="sect2" id="ox.appsuite.user.sect.drive.view.presentation">
 <div class="titlepage"><div><div><h3 class="title">Holding a presentation</h3></div></div></div>
 <a class="indexterm" name="id-1.10.8.10.2"></a><a class="indexterm" name="id-1.10.8.10.3"></a><p id="ox.appsuite.user.concept.drive.view.presentation">You can hold presentations in common Office formats or in the PDF format. Depending on the requirement, use one of the following methods: </p>
@@ -99,7 +99,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.view.attachments.html">Displaying email attachments in <span class="phrase">Drive</span></a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.download.html">Downloading Files or Folder Contents</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.drive.view.presentation">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">Viewing Files</a></p>
+<p id="ox.appsuite.user.parent.drive.view.presentation">Parent topic: <a class="xref" href="ox.appsuite.user.sect.drive.view.html">view files</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html b/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
index 6542c469525e75f6b2dee6b64d345c1ed64c33df..78e57bc69dd85add936161d3a99322accb4677de 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.accounts.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.accounts">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Adding Email Accounts</h2></div></div></div>
-<a class="indexterm" name="id-1.6.18.2"></a><a class="indexterm" name="id-1.6.18.3"></a><p id="ox.appsuite.user.concept.email.accounts">As default, you use your <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.account">primary email account</a> in the groupware. If you use further email accounts like e.g. GMail, you can add those accounts to the groupware. This allows you to access those accounts' emails from within the groupware.</p>
+<a class="indexterm" name="id-1.6.18.2"></a><a class="indexterm" name="id-1.6.18.3"></a><p id="ox.appsuite.user.concept.email.accounts">As default, you use your <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.account">primary email account </a>in the groupware. If you use further email accounts like e.g. GMail, you can add those accounts to the groupware. This allows you to access those accounts' emails from within the groupware.</p>
 <div class="task" id="ox.appsuite.user.task.email.accounts">
 <p class="title">How to add an email account:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
index 6f3eeb76d9dc2c082ae858a673ff402cb809ee10..77a1c3143c01f2d9d9d5be1ff4ce48f5320bb0dc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.attachments.html
@@ -7,7 +7,7 @@
 <link rel="home" href="index.html" title="User Guide">
 <link rel="up" href="ox.appsuite.user.chap.email.html" title="Email">
 <link rel="prev" href="ox.appsuite.user.sect.email.view.html" title="Viewing Emails">
-<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="next" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -47,9 +47,9 @@
 <li class="step">
 <p role="presentation">Select an email with one or multiple attachments.</p>
 <p role="presentation">To display the attachments click the <span class="guibutton"><strong>Attachment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.attachments.view"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> above the email content in the detail view. The attachments will be displayed as preview or as a list.</p>
-<p role="presentation">To toggle the view, click the <span class="guibutton"><strong>Toggle preview</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.unfold.tiles"><object type="image/svg+xml" data="../../images/grid.svg" height="15"></object></span> or <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.unfold.list"><object type="image/svg+xml" data="../../images/list-ul.svg" height="15"></object></span>.</p>
+<p role="presentation">To toggle the view, click the <span class="guibutton"><strong>Toggle preview</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.unfold.tiles"><object type="image/svg+xml" data="../../images/grid.svg" height="15"></object></span> or<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.unfold.list"><object type="image/svg+xml" data="../../images/list-ul.svg" height="15"></object></span>.</p>
 </li>
-<li class="step"><p role="presentation">To apply a function to all attachments, click on a button next to the <span class="guibutton"><strong>Attachment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.symbol"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span>.</p></li>
+<li class="step"><p role="presentation">To apply a function to all attachments, click on a button next to the <span class="guibutton"><strong>Attachment</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.attachments.symbol"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> .</p></li>
 <li class="step">
 <p role="presentation">In order to apply a function to a specific attachment, enable the list view. Click on an attachment.</p>
 <p role="presentation">To display an attachment in the Viewer, enable the preview view. Click on an attachment.</p>
@@ -68,7 +68,7 @@
 <p class="title">How to view all your emails' attachments in the <span class="phrase">Drive</span> app:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.attachments.drive.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All attachments</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.attachments.drive.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All attachments</strong></span>.</p>
 <p role="presentation">You can also click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.attachments.drive.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the <span class="guibutton"><strong>New email</strong></span> button. Click on <span class="guibutton"><strong>All attachments</strong></span>.</p>
 <p role="presentation">The <span class="phrase">Drive</span> app opens. The <span class="guibutton"><strong>My attachments</strong></span> folder shows all attachments of all emails that have been sent or received by you.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html b/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
index 391e92ecfbd03fc584830fab5dc9b2628580a3f1..d0788334ac14c8116432732f16717971a323ef6c 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.deputy.html
@@ -32,7 +32,7 @@
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.deputy">
 <div class="titlepage"><div><div><h2 class="title" style="clear: both">Sending or Receiving Emails as Deputy</h2></div></div></div>
-<a class="indexterm" name="id-1.6.17.2"></a><a class="indexterm" name="id-1.6.17.3"></a><a class="indexterm" name="id-1.6.17.4"></a><a class="indexterm" name="id-1.6.17.5"></a><p id="ox.appsuite.user.orientation.email.deputy">Learn how to act as another user’s <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy</a>. Depending on the permissions granted by this user, you can do the following: </p>
+<a class="indexterm" name="id-1.6.17.2"></a><a class="indexterm" name="id-1.6.17.3"></a><a class="indexterm" name="id-1.6.17.4"></a><a class="indexterm" name="id-1.6.17.5"></a><p id="ox.appsuite.user.orientation.email.deputy">Learn how to act as another user’s <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.deputy">deputy.</a>  Depending on the permissions granted by this user, you can do the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">read emails in the user’s inbox</p></li>
 <li class="listitem"><p role="presentation">edit, manage or delete emails in the user’s inbox</p></li>
@@ -86,7 +86,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
-<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </li>
 <li class="listitem" style="list-style-type: none">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
index 2cd71399ecddd499e9562a2b94c136003db6070c..cf64292a0558e4cf1bd141f7a3ac90dc98fd9a28 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.folder.html
@@ -37,7 +37,7 @@
 <p class="title">How to create a new email folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Select the <span class="guibutton"><strong>Inbox</strong></span> folder in the folder view. Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.folder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Add new folder</strong></span>.</p>
+<p role="presentation">Select the <span class="guibutton"><strong>Inbox</strong></span> folder in the folder view. Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.folder.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name. Click on <span class="guibutton"><strong>Add new folder</strong></span>.</p>
 <p role="presentation">You can also select <span class="guibutton"><strong>My folders</strong></span> or a subfolder in the folder view. Click the <span class="guibutton"><strong>Folder-specific actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.folder.folderactions"><object type="image/svg+xml" data="../../images/plus.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Add new folder</strong></span>.</p>
 </li>
 <li class="step"><p role="presentation">Enter a name in the <span class="guilabel"><strong>Add new folder</strong></span> window. Click on <span class="guibutton"><strong>Add</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
index 9553de1fb5741a576f3eed6c4b7e3ad964b6cd84..093b9e3061ad4dcec33ec88f9b04e852973e2544 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.create.html
@@ -37,8 +37,8 @@
 <p id="ox.appsuite.user.instruction.email.gui.create">In order to open the window, do one of the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Click on <span class="guibutton"><strong>New email</strong></span>.</p></li>
-<li class="listitem"><p role="presentation">Select an email. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.reply"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Select a reply or forward function.</p></li>
-<li class="listitem"><p role="presentation">Select an email draft. Click the <span class="guibutton"><strong>Edit draft</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.original"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> or the  <span class="guibutton"><strong>Edit copy</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.copy"><object type="image/svg+xml" data="../../images/files.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">Select an email. In the detail view, click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.reply"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Select a reply or forward function.</p></li>
+<li class="listitem"><p role="presentation">Select an email draft. In the toolbar, click the <span class="guibutton"><strong>Edit draft</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.original"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span>  or the <span class="guibutton"><strong>Edit copy</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.draft.copy"><object type="image/svg+xml" data="../../images/files.svg" height="15"></object></span>.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.email.gui.create"></p>
 <p class="title">Content</p>
@@ -61,7 +61,7 @@
 </li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>To</strong></span> input field. While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p>
-<p role="presentation">If clicking on <span class="guibutton"><strong>To</strong></span>, <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span> or one of the <span class="guibutton"><strong>Select contacts</strong></span> icons <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.to.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span>, a window for selecting contacts from an address book opens.</p>
+<p role="presentation">If clicking on <span class="guibutton"><strong>To</strong></span>, <span class="guibutton"><strong>CC</strong></span>, <span class="guibutton"><strong>BCC</strong></span> or one of the <span class="guibutton"><strong>Select contacts</strong></span> icons<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.to.addressbookpicker"><object type="image/svg+xml" data="../../images/person-lines-fill.svg" height="15"></object></span> a window for selecting contacts from an address book opens.</p>
 </li>
 </ul>
 </li>
@@ -72,7 +72,7 @@
 <li class="listitem"><p role="presentation">If the email has attachments, the attachments will be displayed as preview or list.</p></li>
 <li class="listitem">
 <p role="presentation">Input field for the email text.</p>
-<p role="presentation">To format the text or to add images, click the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.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.gui.create.format"><object type="image/svg+xml" data="../../images/fonts.svg" height="15"></object></span> in the button bar.</p>
+<p role="presentation">To format the text or to add images, click the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.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.gui.create.format"><object type="image/svg+xml" data="../../images/fonts.svg" height="15"></object></span>in the button bar.</p>
 </li>
 </ul>
 </li>
@@ -81,9 +81,16 @@
 <p role="presentation">Button bar </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">An icon for showing or hiding the formatting options.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add local file</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.attachment"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span>. Adds local files.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add from Drive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.attachmentdrive"><object type="image/svg+xml" data="../../images/cloud.svg" height="15"></object></span>. Adds files that are saved in the <span class="phrase">Drive</span> app.</p></li>
+<li class="listitem">
+<p role="presentation"><span class="guibutton"><strong>Add file</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.attachment"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span>. Opens a menu with functions for adding attachments. </p>
+<ul class="itemizedlist" style="list-style-type: square; ">
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add local file</strong></span>. Adds local files.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Add from Drive</strong></span>. Adds files that are saved in the <span class="phrase">Drive</span> app.</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Attachments from selected mail</strong></span>. Adds the attachments of the email selected in the list view.</p></li>
+</ul>
+</li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Enable encryption</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.encrypt"><object type="image/svg+xml" data="../../images/unlock.svg" height="15"></object></span>. Encrypts the email. A function bar will be displayed above the email text. If clicking on <span class="guibutton"><strong>Options</strong></span>, a menu with encryption options opens:</p></li>
+<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Insert template</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.templates"><object type="image/svg+xml" data="../../images/file-text.svg" height="15"></object></span>. Opens a menu for adding or creating text templates.</p></li>
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.create.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Opens a menu with further functions: </p>
 <ul class="itemizedlist" style="list-style-type: square; ">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
index 35d81d032ac95bad7df319f5b84943aadd6688d3..0747f0d3ff2cb1678d04c9a79eb58196fec820c5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.detailview.html
@@ -34,7 +34,7 @@
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.detailview">
 <div class="titlepage"><div><div><h3 class="title">The <span class="phrase">Email</span> detail view</h3></div></div></div>
 <a class="indexterm" name="id-1.6.8.11.2"></a><p id="ox.appsuite.user.concept.email.gui.detailview">Displays the content of the email that you selected in the list view. If double-clicking on the email in the list view, the data will be displayed in a window.</p>
-<p id="ox.appsuite.user.instruction.email.gui.detailview">To display the detail view, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Enable one of the following settings: <span class="guibutton"><strong>Vertical</strong></span>, <span class="guibutton"><strong>Horizontal</strong></span>.</p>
+<p id="ox.appsuite.user.instruction.email.gui.detailview">To display the detail view, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.detailview.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> In the menu bar. Enable one of the following settings: <span class="guibutton"><strong>Vertical</strong></span>, <span class="guibutton"><strong>Horizontal</strong></span>.</p>
 <p id="ox.appsuite.user.reference.email.gui.detailview"></p>
 <p class="title">Content</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
@@ -66,7 +66,7 @@
 <ul class="itemizedlist" id="ox.appsuite.user.reference.email.gui.detailview.attachments" style="list-style-type: circle; ">
 <li class="listitem">
 <p role="presentation"><span class="guibutton"><strong>Attachment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.attachment"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span>. If clicking on it, the attachments will be displayed as preview or list.</p>
-<p role="presentation">If clicking the <span class="guibutton"><strong>Toggle preview</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.tiles"><object type="image/svg+xml" data="../../images/grid.svg" height="15"></object></span> or  <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.list"><object type="image/svg+xml" data="../../images/list-ul.svg" height="15"></object></span> the attachments will be shown as preview or as list.</p>
+<p role="presentation">If clicking the <span class="guibutton"><strong>Toggle preview</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.tiles"><object type="image/svg+xml" data="../../images/grid.svg" height="15"></object></span> or<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.list"><object type="image/svg+xml" data="../../images/list-ul.svg" height="15"></object></span> , the attachments will be shown as preview or as list.</p>
 </li>
 <li class="listitem"><p role="presentation">Buttons that are used to apply a function to all email attachments at once.</p></li>
 </ul>
@@ -75,7 +75,7 @@
 <li class="listitem">
 <p role="presentation">E-Mail text</p>
 <p role="presentation">Quotes from previous emails are marked at the beginning of the line.</p>
-<p role="presentation">If emails are shown grouped by conversations, only the text of the last email will be displayed. You can open or close a single email of the <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">Conversation</a> by clicking on a free area next to the sender.</p>
+<p role="presentation">If emails are shown grouped by conversations, only the text of the last email will be displayed. You can open or close a single email of the <a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.mailthread">conversation  </a> by clicking on a free area next to the sender.</p>
 </li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.detailview"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
index e819af3a088afaf2b38c2ab9beb8d41dfb065d2e..b690a140166ec977b808cb65b0c8b8b0d129bf8e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.foldertree.html
@@ -39,7 +39,6 @@
 <p class="title">Content</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Inbox</strong></span>. Per default, all incoming emails go to this folder.</p></li>
-<li class="listitem"><p role="presentation"><span class="guibutton"><strong>Unread</strong></span>. This folder shows all unread messages.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Drafts</strong></span>. Contains the emails saved as draft.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Sent</strong></span>. Contains the email sent by you.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Trash</strong></span>. Contains the email deleted by you.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.list.html
index 2865953f535541fa729d161d6544939b3f9cd20c..4c10e8ad939aa08ea5f0268697e8a48c5bd6d97c 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
@@ -42,10 +42,10 @@
 <p role="presentation">The number of emails in this folder.</p>
 </li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.list.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Opens a menu with functions for selecting, editing or sorting the selected folder's emails.</p></li>
-<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">The following details are displayed for each email: Sender, subject, date of receipt. Unread emails 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"><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 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"><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>
 <p role="presentation">If you close the notification, the vacation notice remains active.</p>
@@ -53,7 +53,7 @@
 </ul>
 <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">In the menu bar, 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>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.list"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
index cf360a780d1aa35785472d1d2b9d50c89411454e..e9e32ae6cc7dd893729303372fc19a472bf73481 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.new.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">The <span class="phrase">Email</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.new">
 <div class="titlepage"><div><div><h3 class="title">The New email button</h3></div></div></div>
-<a class="indexterm" name="id-1.6.8.6.2"></a><p id="ox.appsuite.user.concept.email.gui.new">Creates a new email. If clicking the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>, a menu with further functions opens: </p>
+<a class="indexterm" name="id-1.6.8.6.2"></a><p id="ox.appsuite.user.concept.email.gui.new">Creates a new email. The <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> opens a menu with additional functions: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Add mail account</p></li>
 <li class="listitem cap-infostore" id="id-1.6.8.6.3.3.2"><p role="presentation">Depending on the configuration: View all attachments</p></li>
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 7fcc2945b48dbad69792216a7c0c45e91cd699c7..4fb8231603c63e3befd2325c0af09f04d731d650 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
@@ -33,7 +33,7 @@
 <h2 class="sr-only">The <span class="phrase">Email</span> Components</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.gui.settingsmenu">
 <div class="titlepage"><div><div><h3 class="title">The Settings menu</h3></div></div></div>
-<a class="indexterm" name="id-1.6.8.5.2"></a><p id="ox.appsuite.user.concept.email.gui.settingsmenu">The <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.settingsmenu.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar opens a menu with the following functions: </p>
+<a class="indexterm" name="id-1.6.8.5.2"></a><p id="ox.appsuite.user.concept.email.gui.settingsmenu">The <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.settingsmenu.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>  in the menu bar opens a menu with the following functions: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <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>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
index 757b1cdbaf23b25c79401bb4de6d9194ab8c479d..32cdf3a1194c140d0901ba46c252921f03b697f7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.tabs.html
@@ -38,7 +38,7 @@
 <p class="title">Notes:</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Depending on the configuration, inbox tabs might not be available.</p></li>
-<li class="listitem"><p role="presentation">If inbox tabs are available, you can show or hide the inbox tab bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox tabs</strong></span>.</p></li>
+<li class="listitem"><p role="presentation">If inbox tabs are available, you can show or hide the inbox tab bar. To do so, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.tabs.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Inbox tabs</strong></span>.</p></li>
 <li class="listitem"><p role="presentation">The number of inbox tabs and their names and order are preset. Depending on the configuration, some inbox tabs can be renamed or disabled.</p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.gui.tabs"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html b/help/l10n/en_US/ox.appsuite.user.sect.email.gui.toolbar.html
index 9c8f6193a57c1d181e174512fd4d8c58b2d8a102..9f6d5a248127d9640059a875fad3c55a1ae28179 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
@@ -39,7 +39,10 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>. Deletes the emails selected by you.</p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Archive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.archive"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>. Archives the emails selected by you.</p></li>
-<li class="listitem"><p role="presentation">Icons for <span class="guibutton"><strong>replying to</strong></span> and <span class="guibutton"><strong>forwarding</strong></span> the selected emails: <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span></p></li>
+<li class="listitem"><p role="presentation">Icons for <span class="guibutton"><strong>replying to</strong></span> and <span class="guibutton"><strong>forwarding</strong></span> the selected emails:<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span>
+              <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span>
+              <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span>
+            </p></li>
 <li class="listitem"><p role="presentation"><span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.categories"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Opens a menu allowing you to move an email to a category. This icon is only available if the inbox tabs bar is displayed.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Set color</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.label"><object type="image/svg+xml" data="../../images/bookmark.svg" height="15"></object></span>. Opens a menu allowing you to assign a colored label to the selected emails.</p></li>
 <li class="listitem"><p role="presentation">Depending on the configuration: <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.gui.toolbar.starred"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>. Flags the email.</p></li>
@@ -66,6 +69,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a></p>
+<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.delete.html">Deleting emails</a></p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.action.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.action.html
index 653c8505008cc45facf0b752c7943ece27344c0d..fdebcf3ab2a99ce1e17ea6614c874c21d08a6e07 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.action.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.action.html
@@ -41,7 +41,7 @@
 <li class="step"><p role="presentation">Depending on the action, further buttons and inputs fields are displayed. Use such functions to complete the action.</p></li>
 <li class="step">
 <p role="presentation">You can add further actions.</p>
-<p role="presentation">To delete an action, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.action.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to the action.</p>
+<p role="presentation">To delete an action, click the <span class="guibutton"><strong>Delete</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.action.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>next to the action.</p>
 </li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.apply.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.apply.html
index 2997e94f3ede119e93907de66378e71fb40e1e5c..a01acc67a7525cb5a1e5bcafc7054145b097f1a3 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.apply.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.apply.html
@@ -39,7 +39,7 @@
 <p class="title">How to apply a rule to existing emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.apply.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.apply.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Filter rules</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
index 5e4204810967066d827c2d682ddf3cb3effc5dde..6fdd1059dc70dc6c1720782f9c6e294dbb481cd9 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.change.html
@@ -43,7 +43,7 @@
 <p class="title">How to change existing rules:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.change.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.change.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Filter rules</strong></span>.</p></li>
@@ -53,7 +53,7 @@
 <p role="presentation">To enable a rule, click on <span class="guibutton"><strong>Enable</strong></span> next to the rule.</p>
 </li>
 <li class="step">
-<p role="presentation">To change the order, hover the mouse pointer over the <span class="guibutton"><strong>Move</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.change.move"><object type="image/svg+xml" data="../../images/grip-vertical.svg" height="15"></object></span> next to a rule. Drag the rule up or down and drop it appropriately.</p>
+<p role="presentation">To change the order, hover the mouse pointer over the <span class="guibutton"><strong>Move</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.change.move"><object type="image/svg+xml" data="../../images/grip-vertical.svg" height="15"></object></span>. Drag the rule up or down and drop it appropriately.</p>
 <p role="presentation">Note: This function is only available if there are at least two rules.</p>
 </li>
 <li class="step"><p role="presentation">To delete a rule, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.change.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to the rule.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
index 902cefb23cf4d3caa6f4c716635c6c071238e0ea..6cd631d2cc618b98fcea6ea058b1ba12313eca0d 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.create.html
@@ -43,7 +43,7 @@
 <p class="title">How to create a new rule:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Filter rules</strong></span>.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createmove.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createmove.html
index e726a162ff654e2388901ac28efbd36eb21840f6..e164a8f7f73e8b2af3189a65c0c35e496c55c128 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createmove.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createmove.html
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.move.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Move</strong></span>.</p>
+<p role="presentation">In the detail view, click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.move.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Move</strong></span>.</p>
 <p role="presentation">Select a folder in the <span class="guilabel"><strong>Move</strong></span> window. Click on the <span class="guibutton"><strong>Move</strong></span> button.</p>
 </li>
 <li class="step">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createsubjectfrom.html b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createsubjectfrom.html
index 076aabe64a28ae48dd52f8a9181c2e39919d09c3..97f7a98495d22050c6735520e9c23bbc0f2863ad 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createsubjectfrom.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.mailfilter.createsubjectfrom.html
@@ -38,7 +38,7 @@
 <p class="title">How to create a new rule for the subject and the sender:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.createsubjectfrom.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Create filter rule</strong></span>. The <span class="guilabel"><strong>Create new rule</strong></span> window opens.</p></li>
+<li class="step"><p role="presentation">In the detail view, click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.mailfilter.create.createsubjectfrom.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Create filter rule</strong></span>. The <span class="guilabel"><strong>Create new rule</strong></span> window opens.</p></li>
 <li class="step">
 <p role="presentation">Enter a rule name. You can adjust the conditions.</p>
 <p role="presentation">Set an action.</p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
index 4f855fd5dfbe5a808d78d460c4dbf20052762b28..90942b28bf714bbc5ceb88e1d2a6073680e438fd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.addportal.html
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions </strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.addportal.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Add to portal</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.addportal.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Add to portal</strong></span>.</p>
 <p role="presentation">Note: When having selected an email conversation, this function is only available in the detail view, not in the toolbar.</p>
 </li>
 </ol></div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
index 82444e92f81860fe5524744d0a3ad6ed29863eb1..4b6e06c98766dc0bad5b4a785dbf162b6eb6d309 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.archive.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.archive">
 <div class="titlepage"><div><div><h3 class="title">Archiving emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.19.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving emails, those emails are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived emails are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options exist: </p>
+<a class="indexterm" name="id-1.6.14.20.2"></a><p id="ox.appsuite.user.concept.email.manage.archive">When archiving emails, those emails are moved to the <span class="guibutton"><strong>Archive</strong></span> folder. The <span class="guibutton"><strong>Archive</strong></span> folder contains a separate subfolder for each calendar year. The archived emails are saved to those subfolders sorted by the year of receipt. The <span class="guibutton"><strong>Archive</strong></span> folder is created as soon as you initially use this function. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">archive a folder's emails that are older than 90 days</p></li>
 <li class="listitem"><p role="presentation">archive single emails</p></li>
@@ -42,7 +42,7 @@
 <p class="title">How to archive an email folder's content:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.archivefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Archive old messages</strong></span>.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.archivefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name. Click on <span class="guibutton"><strong>Archive old messages</strong></span>.</p></li>
 <li class="step"><p role="presentation">In the <span class="guilabel"><strong>Archive messages</strong></span> window click on  <span class="guibutton"><strong>Archive</strong></span>.</p></li>
 </ol></div>
 </div>
@@ -51,7 +51,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Archive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.archivesingle"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Archive</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.archivesingle"><object type="image/svg+xml" data="../../images/archive.svg" height="15"></object></span>.</p>
 <p role="presentation">You can also use the context menu in the email list view.</p>
 </li>
 </ol></div>
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 e06fbb1d0ae81fec894cb174a595c85b9ac825ee..ce62ff47b051d716af4dc4e36ef95f26174bfd4b 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
@@ -33,7 +33,7 @@
 <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">Working with inbox tabs</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.7.2"></a><a class="indexterm" name="id-1.6.14.7.3"></a><a class="indexterm" name="id-1.6.14.7.4"></a><p id="ox.appsuite.user.concept.email.manage.categories"><a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.inboxcategories">Inbox tabs</a> allow you to save incoming emails in the <span class="guibutton"><strong>Inbox</strong></span> folder separated by senders. If clicking on an inbox tab, only the emails assigned to this inbox tab will be shown in the display area. The following options exist: </p>
+<a class="indexterm" name="id-1.6.14.7.2"></a><a class="indexterm" name="id-1.6.14.7.3"></a><a class="indexterm" name="id-1.6.14.7.4"></a><p id="ox.appsuite.user.concept.email.manage.categories"><a class="link" href="ox.appsuite.user.sect.about.glossary.html#ox.appsuite.user.reference.about.glossary.inboxcategories">Inbox tabs </a>allow you to save incoming emails in the <span class="guibutton"><strong>Inbox</strong></span> folder separated by senders. If clicking on an inbox tab, only the emails assigned to this inbox tab will be shown in the display area. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">enable or disable inbox tabs</p></li>
 <li class="listitem"><p role="presentation">assign incoming emails to an inbox tab</p></li>
@@ -63,7 +63,7 @@
 </li>
 <li class="step">
 <p role="presentation">Drag an email from the list view to a tab in the tabs bar and drop it there.</p>
-<p role="presentation">You can also select an email. Click the <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span> in the toolbar. Select a tab from the menu.</p>
+<p role="presentation">You can also select an email. In the toolbar, click the <span class="guibutton"><strong>Set category</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.assign.moveto"><object type="image/svg+xml" data="../../images/folder.svg" height="15"></object></span>. Select a tab from the menu.</p>
 </li>
 <li class="step"><p role="presentation">In order to finish the process, do one of the following: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In order to only move the selected email to the tab, close the pop-up window.</p></li>
@@ -75,7 +75,7 @@
 <p class="title">How to edit the inbox tabs view:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>Inbox tabs</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.categories.edit.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Inbox tabs</strong></span>.</p>
 <p role="presentation">You can also double-click or right-click on an inbox tab in the inbox tab bar.</p>
 <p role="presentation">The <span class="guilabel"><strong>Configure tabs</strong></span> window opens.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
index 27c5ed4b9e18ded7e1166a3d51c0b331839b662a..6ed53014c4639da67ad1ca954459a109d7ce2b7b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.delete.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.delete">
 <div class="titlepage"><div><div><h3 class="title">Deleting emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.20.2"></a><a class="indexterm" name="id-1.6.14.20.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options exist: </p>
+<a class="indexterm" name="id-1.6.14.21.2"></a><a class="indexterm" name="id-1.6.14.21.3"></a><p id="ox.appsuite.user.concept.email.manage.delete">The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Delete individual emails or entire email conversations. By default, the emails are moved to the Trash folder.</p></li>
 <li class="listitem"><p role="presentation">Delete all emails of an email folder. By default, the emails are moved to the Trash folder.</p></li>
@@ -46,7 +46,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.delete.toolbar"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.delete.detailview"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the detail view.</p></li>
 <li class="listitem"><p role="presentation">Press the [Del] or [Backspace] key on the keyboard.</p></li>
@@ -62,7 +62,7 @@
 <p class="title">How to delete all emails of a folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">In the folder view, select the folder which emails you want to delete.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on the <span class="guibutton"><strong>Delete all messages</strong></span> button.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptyfolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name. Click on the <span class="guibutton"><strong>Delete all messages</strong></span> button.</p></li>
 </ol></div>
 <div class="taskrelated">
           <p>Result: The email will be moved to the <span class="guibutton"><strong>Trash</strong></span> folder.</p>
@@ -74,7 +74,7 @@
 <li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar. Click on <span class="guibutton"><strong>Move</strong></span>.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.toolbar"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Move</strong></span>.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">If you have selected a single email, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.undelete.actions.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view.</p></li>
 <li class="listitem"><p role="presentation">To recover all emails in the trash, use the context menu in the email list view. Click on the <span class="guibutton"><strong>Move all messages</strong></span> button.</p></li>
@@ -91,7 +91,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Open the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.deleteforever"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="step"><p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.manage.deleteforever"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
 </ol></div>
 </div>
 <div class="task" id="ox.appsuite.user.task.email.manage.emptytrash">
@@ -101,7 +101,7 @@
         </div>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select the <span class="guibutton"><strong>Trash</strong></span> folder in the folder view.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.emptytrash.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name. Click on <span class="guibutton"><strong>Empty folder</strong></span>.</p></li>
 <li class="step"><p role="presentation">Confirm that you want to empty the folder.</p></li>
 </ol></div>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
index c891b2f5f27f1b3e47bebdb01a39f998fcbde667..70481f637d1fcd8be2dd20709317c818f1985a5e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.draft.html
@@ -45,12 +45,12 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email in the <span class="guibutton"><strong>Drafts</strong></span> folder.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Edit draft</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.draft.original"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> or the  <span class="guibutton"><strong>Edit copy</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.draft.copy"><object type="image/svg+xml" data="../../images/files.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Edit draft</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.draft.original"><object type="image/svg+xml" data="../../images/pencil.svg" height="15"></object></span> or the <span class="guibutton"><strong>Edit copy</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.draft.copy"><object type="image/svg+xml" data="../../images/files.svg" height="15"></object></span>.</p>
 <p role="presentation">Edit the content.</p>
 </li>
 <li class="step"><p role="presentation">You can finish editing the email or send the email: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">In order to finish editing the email, click the <span class="guibutton"><strong>Close</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.senddraft.cancel"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the title bar. The <span class="guilabel"><strong>Save draft</strong></span> window opens.</p>
+<p role="presentation">In order to finish editing the email, click the <span class="guibutton"><strong>Close</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.senddraft.cancel"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>in the title bar. The <span class="guilabel"><strong>Save draft</strong></span> window opens.</p>
 <p role="presentation">In order to save your changes to the draft, click on <span class="guibutton"><strong>Save draft</strong></span>.</p>
 <p role="presentation">To discard your changes to the draft, click on <span class="guibutton"><strong>Delete draft</strong></span>.</p>
 </li>
@@ -67,7 +67,10 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">Email</span> toolbar</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p></li></ul>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
+<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+</li></ul>
 <p id="ox.appsuite.user.parent.email.manage.draft">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
 </div>
           </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html
index f091d12fca2dfa1864d6248baab3362bf54ba9ce..1e35d28659f471616d987c13f8842a08b3032a8b 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.expungefolder.html
@@ -33,13 +33,13 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.expungefolder">
 <div class="titlepage"><div><div><h3 class="title">Cleaning up email folders</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.21.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the email client's settings, emails that you deleted from within an email client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those emails will be shown as crossed out in the groupware. To delete those emails clean up the email folder.</p>
+<a class="indexterm" name="id-1.6.14.22.2"></a><p id="ox.appsuite.user.concept.email.manage.expungefolder">Depending on the email client's settings, emails that you deleted from within an email client like Apple Mail, MS Outlook or Mozilla Thunderbird, might be deleted only after having signed out from the client. In the meantime, those emails will be shown as crossed out in the groupware. To delete those emails clean up the email folder.</p>
 <p id="ox.appsuite.user.hint.email.manage.expungefolder">Note: Depending on the configuration, this function is not available as such emails are not displayed.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.expunge">
 <p class="title">How to clean up an email folder:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">In the folder view, select the folder that you want to clean up.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name. Click on <span class="guibutton"><strong>Clean up</strong></span>.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.expungefolder"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name. Click on <span class="guibutton"><strong>Clean up</strong></span>.</p></li>
 </ol></div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.expungefolder"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.html
index 2de03d4de8a61077f3705880e32d954f0ee6b124..ee1454b3a025e04c7b68c3c23ec42f47f6a32f34 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
@@ -44,6 +44,7 @@
 <li class="listitem cap-tasks" id="id-1.6.14.4.1.8"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.reminder.html">Creating email reminders</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.addportal.html">Adding an email to the Portal</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a></p></li>
+<li class="listitem feat-io-ox-core-mailPDFExport" id="id-1.6.14.4.1.11"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.print.html">Printing emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.archive.html">Archiving emails</a></p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
index 364c6c747bda53ad3a256f15604ed1f238b6e036..484e8f5a48e630ff164057923452f2e5da5bf663 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.import.html
@@ -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.save.html" title="Saving emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.pdfexport.html" title="Exporting emails as PDF">
 <link rel="next" href="ox.appsuite.user.sect.email.manage.print.html" title="Printing emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.save.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.print.html">Next</a></li>
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.import">
 <div class="titlepage"><div><div><h3 class="title">Importing emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.17.2"></a><a class="indexterm" name="id-1.6.14.17.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
+<a class="indexterm" name="id-1.6.14.18.2"></a><a class="indexterm" name="id-1.6.14.18.3"></a><p id="ox.appsuite.user.concept.email.manage.import">You can import an email that is available in the EML format.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.import">
 <p class="title">How to import an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.label.html
index 168311bf7b6a8815ee3a86439e0a5150aa51aa75..0816a6a305c91b52b37d86bc18df6f0aecbfeefc 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
@@ -44,12 +44,12 @@
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step"><p role="presentation">Depending on the configuration, 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>Set color</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.label.add"><object type="image/svg+xml" data="../../images/flag.svg" height="15"></object></span> in the toolbar. Select a color.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Set color</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.label.add"><object type="image/svg+xml" data="../../images/flag.svg" height="15"></object></span>. Select a color.</p>
 <p role="presentation">To remove a label, select <span class="guibutton"><strong>None</strong></span>.</p>
-<p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>Assign color</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.label.detailview.add"><object type="image/svg+xml" data="../../images/flag.svg" height="15"></object></span> in the detail view.</p>
+<p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>Assign color</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.label.detailview.add"><object type="image/svg+xml" data="../../images/flag.svg" height="15"></object></span> in the detail view.</p>
 </li>
 <li class="listitem">
-<p role="presentation">Click the <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.starred.add"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Flag</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.starred.add"><object type="image/svg+xml" data="../../images/star.svg" height="15"></object></span>.</p>
 <p role="presentation">To remove the flag, use one of the following methods: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">Again click the icon in the toolbar or in the detail view.</p></li>
 <li class="listitem"><p role="presentation">Use the context menu in the email list view.</p></li>
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 6789ea482de52c8509cf802f5b8df9a0536dff32..e922a3a97cebc59008a04a8ca9606ebaf1183e2b 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
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.mark">
 <div class="titlepage"><div><div><h3 class="title">Marking emails as read or unread</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.9.2"></a><a class="indexterm" name="id-1.6.14.9.3"></a><a class="indexterm" name="id-1.6.14.9.4"></a><p id="ox.appsuite.user.concept.email.manage.mark">Unread E-Mails are marked with the Unread icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span>. The following options exist: </p>
+<a class="indexterm" name="id-1.6.14.9.2"></a><a class="indexterm" name="id-1.6.14.9.3"></a><a class="indexterm" name="id-1.6.14.9.4"></a><p id="ox.appsuite.user.concept.email.manage.mark">Unread emails are marked with the Unread icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span> . The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <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>
@@ -44,15 +44,15 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar. Select <span class="guibutton"><strong>Mark as unread</strong></span> or <span class="guibutton"><strong>Mark as read</strong></span>.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Select <span class="guibutton"><strong>Mark as unread</strong></span> or <span class="guibutton"><strong>Mark as read</strong></span>.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">For single emails, click the <span class="guibutton"><strong>Mark as unread</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.read.actions"><object type="image/svg+xml" data="../../images/circle.svg" height="15"></object></span> or the <span class="guibutton"><strong>Mark as read</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span> in the detail view.</p></li>
+<li class="listitem"><p role="presentation">If you have selected a single email, click the <span class="guibutton"><strong>Mark as unread</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.read.actions"><object type="image/svg+xml" data="../../images/circle.svg" height="15"></object></span>  or the <span class="guibutton"><strong>Mark as read</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.unread"><object type="image/svg+xml" data="../../images/circle-fill.svg" height="15"></object></span> in the detail view.</p></li>
 <li class="listitem"><p role="presentation">Use the context menu in the email list view.</p></li>
 </ul></p>
 </li>
 </ol></div>
 <div class="taskrelated">
-          <p>To mark all emails of a folder as read, select the folder. Click the <span class="guibutton"><strong>Actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.list.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> next to the folder name or use the context menu.</p>
+          <p>To mark all emails of a folder as read, select the folder. Click the <span class="guibutton"><strong>Actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.mark.list.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>next to the folder name or use the context menu.</p>
         </div>
 </div>
 <p id="ox.appsuite.user.related.email.manage.mark"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html
new file mode 100644
index 0000000000000000000000000000000000000000..dae6bfbe1c3221a1cc6a377975a52ef962b490d5
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.pdfexport.html
@@ -0,0 +1,56 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Exporting emails as PDF</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.manage.html" title="Managing Emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.manage.save.html" title="Saving emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.import.html" title="Importing emails">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.save.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.import.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Managing Emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.manage.pdfexport">
+<div class="titlepage"><div><div><h3 class="title">Exporting emails as PDF</h3></div></div></div>
+<a class="indexterm" name="id-1.6.14.17.2"></a><a class="indexterm" name="id-1.6.14.17.3"></a><a class="indexterm" name="id-1.6.14.17.4"></a><p id="ox.appsuite.user.hint.email.manage.pdfexport">Note: Depending on the configuration, this function might not be available.</p>
+<p id="ox.appsuite.user.concept.email.manage.pdfexport">You can export an email and its attachments in docx format as PDF. As soon as the PDF file has been created, it will be saved in a <span class="phrase">Drive</span> folder that can be defined by you. Depending on the data volume, the download can take a while. As soon as the process has been finished, you will receive a notification.</p>
+<div class="task" id="ox.appsuite.user.task.email.manage.pdfexport">
+<p class="title">How to export emails as PDF:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Select an email.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.pdfexport.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Save as PDF</strong></span>.</p></li>
+<li class="step"><p role="presentation">Fill in the details for saving the file.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.manage.pdfexport"></p>
+<p class="title">User interface:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.toolbar.html">The <span class="phrase">Email</span> toolbar</a></p></li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.save.html">Saving emails</a></p></li></ul>
+<p id="ox.appsuite.user.parent.email.manage.pdfexport">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
index f4f9f26dbab9fe099df6b446e8e99f0c2250886b..a2c9403da57773b9f64ffdf0410d1dc33712f117 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.print.html
@@ -33,13 +33,13 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.print">
 <div class="titlepage"><div><div><h3 class="title">Printing emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.18.2"></a><a class="indexterm" name="id-1.6.14.18.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an email or several emails.</p>
+<a class="indexterm" name="id-1.6.14.19.2"></a><a class="indexterm" name="id-1.6.14.19.3"></a><p id="ox.appsuite.user.concept.email.manage.print">You can print the content of an email or several emails.</p>
 <div class="task" id="ox.appsuite.user.task.email.manage.print">
 <p class="title">How to print an email's content:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.print.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar. Click on <span class="guibutton"><strong>Print</strong></span>.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.print.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Print</strong></span>.</p>
 <p role="presentation">Or: <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">If you have selected a single email, you can also use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.print.detailview"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view.</p></li>
 <li class="listitem"><p role="presentation">You can also use the context menu in the email list view.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
index 38f842c4829f1f2e3bc7200f3b1911243d9cf229..e8e5b5df9d1ab797c593c87c94c541eeafae9c91 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.reminder.html
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions </strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.reminder.actionss"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Reminder</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.reminder.actionss"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Reminder</strong></span>.</p>
 <p role="presentation">Note: When having selected an email conversation, this function is only available in the detail view, not in the toolbar.</p>
 </li>
 <li class="step"><p role="presentation">Complete the details in the <span class="guilabel"><strong>Remind me</strong></span> window.</p></li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
index 25ac796ded8aa974cec206e45dbe0f29b26a0044..75525ba08e7e9171effd5a5f8f9e0216a2d6a7e4 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.save.html
@@ -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.addportal.html" title="Adding an email to the Portal">
-<link rel="next" href="ox.appsuite.user.sect.email.manage.import.html" title="Importing emails">
+<link rel="next" href="ox.appsuite.user.sect.email.manage.pdfexport.html" title="Exporting emails as PDF">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,7 +25,7 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.manage.addportal.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.import.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
@@ -38,7 +38,7 @@
 <p class="title">How to save an email:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span>  icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.save.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Save as file</strong></span>.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.save.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the toolbar or in the detail view. Click on <span class="guibutton"><strong>Save as file</strong></span>.</p></li>
 <li class="step"><p role="presentation">Fill in the details for saving the file.</p></li>
 </ol></div>
 </div>
@@ -48,7 +48,10 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></p></li>
+<li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.import.html">Importing emails</a></p>
+<p role="presentation" class="feat-io-ox-core-mailPDFExport"><a class="xref" href="ox.appsuite.user.sect.email.manage.pdfexport.html">Exporting emails as PDF</a></p>
+</li>
 <li class="listitem cap-dataexport" id="id-1.6.14.16.5.2.3"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.downloadpersonaldata.html">Downloading Personal Data</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.email.manage.save">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.manage.html">Managing Emails</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
index 6a823a284787e4c6093a7e0f7d635fafc62eaf49..6ea7534ab93b5e0c04eb08c7da8cc904dc536986 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.source.html
@@ -39,7 +39,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>More actions </strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.source.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar or in the detail view. Click on <span class="guibutton"><strong>View source</strong></span>.</p>
+<p role="presentation">Click the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.source.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the toolbar or in the detail view. Click on <span class="guibutton"><strong>View source</strong></span>.</p>
 <p role="presentation">You can also use the context menu in the email list view.</p>
 </li>
 </ol></div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
index 68bb1ed25360aa70f81cdb57a1854da45a3eb37b..5bcc67690216b98af9d78a4ad1f6e32020ad6939 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.manage.unifiedmail.html
@@ -33,7 +33,7 @@
 <h2 class="sr-only">Managing Emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.manage.unifiedmail">
 <div class="titlepage"><div><div><h3 class="title">Using Unified Mail</h3></div></div></div>
-<a class="indexterm" name="id-1.6.14.22.2"></a><a class="indexterm" name="id-1.6.14.22.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display emails from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
+<a class="indexterm" name="id-1.6.14.23.2"></a><a class="indexterm" name="id-1.6.14.23.3"></a><p id="ox.appsuite.user.concept.email.manage.unifiedmail">With Unified Mail you can display emails from multiple email accounts in one central folder. This gives you a quick overview of the multiple email accounts' inboxes. Unified Mail can be described as follows: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">In addition to an email account's inbox, the <span class="guibutton"><strong>Unified Mail</strong></span> folder shows a further view for the account's emails. The emails actually exist only once.</p></li>
 <li class="listitem"><p role="presentation">Emails in the Inbox's subfolders are not displayed in the <span class="guibutton"><strong>Unified Mail</strong></span> folder.</p></li>
@@ -44,7 +44,7 @@
 <p class="title">How to activate Unified Mail for an email account:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.unifiedmail.activate.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.manage.unifiedmail.activate.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Accounts</strong></span> in the left pane.</p></li>
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 3eb773454aeb7d655d850fc251632d1daad1ab0d..939682f3a9a77e9261590ab579a4eddba4cc85d1 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
@@ -64,7 +64,7 @@
 <li class="listitem"><p role="presentation">If contacts match the search term, those contacts will be suggested in the search menu. To search for emails that contain one of those contacts as sender or recipient, click on the contact.</p></li>
 </ul></p></li>
 <li class="step">
-<p role="presentation">You can use further filters by clicking the <span class="guibutton"><strong>More search options</strong></span>  icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the search field. A window with search options opens. <ul class="itemizedlist" style="list-style-type: disc; ">
+<p role="presentation">You can use further filters by clicking the <span class="guibutton"><strong>More search options</strong></span>  icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>  in the search field. A window with search options opens. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
 <p role="presentation">To define the folder to be searched, select an entry in <span class="guibutton"><strong>Search in</strong></span>.</p>
 <p role="presentation">If you select <span class="guibutton"><strong>All folders</strong></span>, all folders and subfolders of the internal email account are searched. Note: Depending on the email server, this function might not be available. In this case, only the current folder will be searched, no subfolders.</p>
@@ -83,8 +83,8 @@
         <p>The search results will be displayed in the list view. For each search result, the folder with the found object is displayed.</p>
         <p>Below the search window, the filters used will be displayed except for the <span class="guibutton"><strong>Contains words</strong></span> filter. The following options exist: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">You can add filters and start a new search by clicking the <span class="guibutton"><strong>More search options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the search field.</p></li>
-<li class="listitem"><p role="presentation">You can remove a filter and start a new search by clicking the <span class="guibutton"><strong>Remove filter</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> next to the filter.</p></li>
+<li class="listitem"><p role="presentation">You can add filters and start a new search by clicking the <span class="guibutton"><strong>More search options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.addfilter"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span>  in the search field.</p></li>
+<li class="listitem"><p role="presentation">You can remove a filter and start a new search by clicking the <span class="guibutton"><strong>Remove filter</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.removefilter"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span>  next to the filter.</p></li>
 </ul>
         <p>In order to finish the search, click the <span class="guibutton"><strong>Cancel search</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.search.options.close"><object type="image/svg+xml" data="../../images/x.svg" height="15"></object></span> in the search field.</p>
       </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html
new file mode 100644
index 0000000000000000000000000000000000000000..a39516636da6275dd35dc309d6c71a937535a4cb
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentexisting.html
@@ -0,0 +1,68 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Adding attachments from existing emails</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.attachments.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Send emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentexisting">
+<div class="titlepage"><div><div><h3 class="title">Adding attachments from existing emails</h3></div></div></div>
+<a class="indexterm" name="id-1.6.11.9.2"></a><a class="indexterm" name="id-1.6.11.9.3"></a><p id="ox.appsuite.user.concept.email.send.attachmentexisting">Depending on the configuration, you can add attachments from existing emails to a new email.</p>
+<div class="task" id="ox.appsuite.user.task.email.send.attachmentexisting">
+<p class="title">How to add existing attachments to a new email:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">In the list view, select an email that contains attachments. Click on <span class="guibutton"><strong>New email</strong></span>.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Attachments</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentexisting"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> in the button bar of the email editing window.</p>
+<p role="presentation">Below <span class="guibutton"><strong>Files from selected email</strong></span>, select the files you want to send as attachment.</p>
+<p role="presentation">If you did not select an email in step 1, the attachments of the most recently received email are displayed below <span class="guibutton"><strong>Recent attachments</strong></span>.</p>
+</li>
+<li class="step"><p role="presentation">You can add further existing attachments. To do so, select an email with attachments in the list view while the email editing window is open.</p></li>
+<li class="step"><p role="presentation">Fill in the details for sending the email.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.options.email.send.attachmentexisting">You can also use one of the following options to add existing attachments: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">In the list view, select <span class="guibutton"><strong>New email with attachment</strong></span> from an email’s context menu.</p></li>
+<li class="listitem"><p role="presentation">In the detail view, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentexisting.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>. Select <span class="guibutton"><strong>New email with attachment</strong></span>.</p></li>
+</ul>
+<p id="ox.appsuite.user.related.email.send.attachmentexisting"></p>
+<p class="title">Superordinated action:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.email.send..attachmentexisting">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
index 665ef5263269d45264562521ee6463e46af9bf4c..048e9dcb8811d3198037919f9fa1fbeb544284a7 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachmentlink.html
@@ -1,13 +1,13 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending attachments as link</title>
+<title>send attachments as link</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
-<link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing emails">
+<link rel="next" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -22,18 +22,18 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.attachments.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.signatures.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.templates.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachmentlink">
-<div class="titlepage"><div><div><h3 class="title">Sending attachments as link</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.9.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">This function allows to send large attachments by email. This is how it works: </p>
+<div class="titlepage"><div><div><h3 class="title">send attachments as link</h3></div></div></div>
+<a class="indexterm" name="id-1.6.11.10.2"></a><p id="ox.appsuite.user.concept.email.send.attachmentlink">This function allows to send large attachments by email. This is how it works: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The attachments will be uploaded to a new folder below <span class="guibutton"><strong>Drive Mail</strong></span> in the <span class="phrase">Drive</span> app. The name of this folder corresponds to the email subject. The folder is shared with a public link.</p></li>
 <li class="listitem"><p role="presentation">The email recipients will receive a link for downloading the attachments.</p></li>
@@ -46,7 +46,7 @@
 <p role="presentation">To send a local file as attachment, click the <span class="guibutton"><strong>Attachments</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> in the button bar. Select at least one file.</p>
 <p role="presentation">You can also add an attachment by dragging one or several files from a file browser or from the desktop to the email window.</p>
 </li>
-<li class="listitem"><p role="presentation">To use a current file version from the <span class="phrase">Drive</span> app as attachment, click the  <span class="phrase"><span class="guibutton"><strong>Add from Drive </strong></span></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.drive"><object type="image/svg+xml" data="../../images/cloud.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">To use a current file version from the <span class="phrase">Drive</span> app as attachment, click the  <span class="phrase"><span class="guibutton"><strong>Add from Drive </strong></span></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.drive"><object type="image/svg+xml" data="../../images/cloud.svg" height="15"></object></span> in the button bar.</p></li>
 </ul></p></li>
 <li class="step"><p role="presentation">You can remove an attachment if required. To do so hover over an attachment. Click the <span class="guibutton"><strong>Remove attachment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
 <li class="step">
@@ -71,7 +71,7 @@
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">Depending on the configuration, there might be a maximum file size for attachments that can be sent as link.</p></li>
 <li class="listitem">
-<p role="presentation">In the list view, the email will be marked with the icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.hint"><object type="image/svg+xml" data="../../images/cloud-download-fill.svg" height="15"></object></span> in the <span class="guibutton"><strong>Sent</strong></span> folder. When viewing the email, the following information are displayed at the top of the email text: </p>
+<p role="presentation">In the <span class="guibutton"><strong>Sent</strong></span> folder, the email will be marked with the icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachmentlink.hint"><object type="image/svg+xml" data="../../images/cloud-download-fill.svg" height="15"></object></span>. When viewing the email, the following information are displayed at the top of the email text: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">A link to the folder containing the attachment.</p></li>
 <li class="listitem"><p role="presentation">Information about the expiration date and a possibly used password.</p></li>
@@ -87,8 +87,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.email.send.attachmentlink">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html
index 1468be63d98475d2d69eca5e746cf9edecabb5ef..99d9784a960b17af91cf47701d47ebcbd430f9d0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attachments.html
@@ -5,9 +5,9 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
-<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="next" href="ox.appsuite.user.sect.email.send.attachmentexisting.html" title="Adding attachments from existing emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
       <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
@@ -25,25 +25,25 @@
 <li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.replyto.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
-<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Next</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Next</a></li>
 </ul></div>
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attachments">
 <div class="titlepage"><div><div><h3 class="title">Adding attachments</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.8.2"></a><a class="indexterm" name="id-1.6.11.8.3"></a><p id="ox.appsuite.user.concept.emal.add.attachments">Depending on the configuration, you can attach files that are saved on your computer or in the <span class="phrase">Drive</span> app.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.attachments">
 <p class="title">How to add attachments in the email editing window:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Select the files to be sent as attachment. <ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="step"><p role="presentation">Select the files to be sent as attachment. <ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p role="presentation">Click the <span class="guibutton"><strong>Attachments</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachments"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> in the button bar. In the menu, specify which files you want to add: <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem">
-<p role="presentation">To send a local file as attachment, click the <span class="guibutton"><strong>Add local file</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachments"><object type="image/svg+xml" data="../../images/paperclip.svg" height="15"></object></span> in the button bar.</p>
+<p role="presentation">To send a local file as attachment, click on <span class="guibutton"><strong>Add local file</strong></span>.</p>
 <p role="presentation">You can also drag one local file or several local files from a file browser or the desktop to the email editing window.</p>
 </li>
-<li class="listitem"><p role="presentation">To send a current file version from the <span class="phrase">Drive</span> app as attachment, click the  <span class="phrase"><span class="guibutton"><strong>Add from Drive </strong></span></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachment.drive"><object type="image/svg+xml" data="../../images/cloud.svg" height="15"></object></span> in the button bar.</p></li>
-</ul></p></li>
+<li class="listitem"><p role="presentation">In order to use the current version of a file from the <span class="phrase">Drive</span> app as an attachment, click on <span class="guibutton"><strong>Add from Drive</strong></span>.</p></li>
+</ul></p></li></ul></p></li>
 <li class="step"><p role="presentation">You can remove an attachment if required. To do so hover over an attachment. Click the <span class="guibutton"><strong>Remove attachment</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attachments.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span>.</p></li>
 </ol></div>
 </div>
@@ -60,8 +60,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.email.send.attachments">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html
index d00142435129cda2c02ff96cb927877930bc9577..2f8dfc0ea4fd37040b0dd4df252243aab6c88b7f 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.attendees.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.vacationnotice.html" title="Sending a vacation notice automatically">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,16 +30,16 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.attendees">
 <div class="titlepage"><div><div><h3 class="title">Sending an email to appointment participants</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.14.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
+<a class="indexterm" name="id-1.6.11.16.2"></a><div class="task" id="ox.appsuite.user.task.email.send.attendees">
 <p class="title">How to send an email to all appointment participants:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Depending on the selected view, you have the following options in the <span class="phrase">Calendar</span>: <ul class="itemizedlist" style="list-style-type: disc; ">
-<li class="listitem"><p role="presentation">In a calendar view, click on an appointment with multiple participants. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attendees.popup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the pop-up.</p></li>
-<li class="listitem"><p role="presentation">In the list view, select an appointment with multiple participants. Click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attendees.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the toolbar.</p></li>
+<li class="listitem"><p role="presentation">In a calendar view, click on an appointment with multiple participants. In the pop-up, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attendees.popup.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">In the list view, select an appointment with multiple participants. In the toolbar, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.attendees.toolbar.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 </ul></p>
 <p role="presentation">Click on <span class="guibutton"><strong>Send mail to all participants</strong></span>.</p>
 </li>
@@ -55,7 +55,7 @@
 </li>
 <li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.attendees">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html
index ec1f942d77385ec58f2481f694464a3cb7625548..25c18e10d293c21695cf95417ae4354ed4b0fab8 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.autoforward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an email to appointment participants">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,15 +30,15 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.autoforward">
 <div class="titlepage"><div><div><h3 class="title">Automatically forwarding emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let emails be automatically forwarded to another address.</p>
+<a class="indexterm" name="id-1.6.11.15.2"></a><p id="ox.appsuite.user.concept.email.send.autoforward">You can let emails be automatically forwarded to another address.</p>
 <div class="task" id="ox.appsuite.user.task.email.send.autoforward">
 <p class="title">How to automatically forward emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.autoforward.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.autoforward.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -70,7 +70,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.autoforward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html
index 7b13f6489acfc8a697ead37bf851cc9cfdf2f8c5..dd90f8ec4164a20708c806772286a893b1e26f96 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.forward.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.autoforward.html" title="Automatically forwarding emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.forward">
 <div class="titlepage"><div><div><h3 class="title">Forwarding emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.12.2"></a><p id="ox.appsuite.user.concept.email.send.forward">If you forward an email, some of the email's input fields are pre-filled: </p>
+<a class="indexterm" name="id-1.6.11.14.2"></a><p id="ox.appsuite.user.concept.email.send.forward">If you forward an email, some of the email's input fields are pre-filled: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The subject of the email will be entered as the subject of the forwarded email. The subject will be preceded with the text "Fwd: ".</p></li>
 <li class="listitem">
@@ -50,9 +50,9 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select one or several emails.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Forward</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></span> in the toolbar.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Forward</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.forward"><object type="image/svg+xml" data="../../images/forward.svg" height="15"></object></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">Use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.forward.more"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view.</p></li>
+<li class="listitem"><p role="presentation">In the detail view, use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.forward.more"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Use the context menu in the email list view.</p></li>
 </ul></p>
 </li>
@@ -73,7 +73,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.forward">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
index 92b10da999736b62e4c65179357692e642cd17b7..f969ffcfbdca9b910c6c887005c0485290fb435e 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.html
@@ -1,7 +1,7 @@
 <html lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Sending Emails</title>
+<title>Send emails</title>
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
@@ -31,19 +31,21 @@
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
 <div class="sect1" id="ox.appsuite.user.sect.email.send">
-<div class="titlepage"><div><div><h2 class="title" style="clear: both">Sending Emails</h2></div></div></div>
+<div class="titlepage"><div><div><h2 class="title" style="clear: both">Send emails</h2></div></div></div>
 <p id="ox.appsuite.user.orientation.email.send">Learn how to send an email and about the functions available for customizing the email content: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p></li>
-<li class="listitem cap-infostore" id="id-1.6.11.2.1.5"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p></li>
+<li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p></li>
+<li class="listitem cap-infostore" id="id-1.6.11.2.1.6"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p></li>
+<li class="listitem"><p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.reply.html">Replying to emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.autoforward.html">Automatically forwarding emails</a></p></li>
-<li class="listitem cap-calendar" id="id-1.6.11.2.1.10"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p></li>
+<li class="listitem cap-calendar" id="id-1.6.11.2.1.12"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attendees.html">Sending an email to appointment participants</a></p></li>
 <li class="listitem"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p></li>
 </ul>
 <p id="ox.appsuite.user.related.email.send"></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
index 4520ecb6b13c8f89b0733d7ab34f4228c0b0ac82..3f6e346c6cb16b1a23a44aed0a9673f76283e2e0 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.new.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="next" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.new">
 <div class="titlepage"><div><div><h3 class="title">Sending a new email</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.5.2"></a><a class="indexterm" name="id-1.6.11.5.3"></a><a class="indexterm" name="id-1.6.11.5.4"></a><div class="task" id="ox.appsuite.user.task.email.send.new">
@@ -38,7 +38,7 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
 <p role="presentation">Click on <span class="guibutton"><strong>New email</strong></span>.</p>
-<p role="presentation">If you work in another app and you do not want to leave that app, you can use the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> in the button for creating objects.</p>
+<p role="presentation">If you work in another app and you do not want to leave that app, you can use the <span class="guibutton"><strong>More actions</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.more"><object type="image/svg+xml" data="../../images/chevron-down.svg" height="15"></object></span> on the button for creating new objects.</p>
 </li>
 <li class="step"><p role="presentation">Enter the recipients' email addresses in the <span class="guibutton"><strong>To</strong></span> field. <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">While entering the recipients, matching suggestions will be displayed. To accept a suggestion, click on it.</p></li>
@@ -63,7 +63,7 @@
 <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">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>
 </li>
 <li class="listitem">
@@ -73,7 +73,7 @@
 </ul>
 </li>
 <li class="listitem">
-<p role="presentation">You can use further options by clicking the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the button bar: </p>
+<p role="presentation">If clicking the <span class="guibutton"><strong>Options</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.new.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the button bar, you can use further options: </p>
 <ul class="itemizedlist" style="list-style-type: circle; ">
 <li class="listitem"><p role="presentation">attach your signature</p></li>
 <li class="listitem"><p role="presentation">set the priority</p></li>
@@ -88,7 +88,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.new.html">The New email button</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.create.html">The email editing window</a></p>
 </li></ul>
-<p> </p>
+<p>  </p>
 <p class="title">Subordinated actions:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.contacts.useaddressbook.html">Automatically Adding Contacts or Resources from an Address Book</a></p>
@@ -96,10 +96,12 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.sender.html">Selecting a sender address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.replyto.html">Setting reply-to address</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachments.html">Adding attachments</a></p>
-<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Sending attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentexisting.html">Adding attachments from existing emails</a></p>
+<p role="presentation" class="cap-infostore"><a class="xref" href="ox.appsuite.user.sect.email.send.attachmentlink.html">send attachments as link</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
 </li></ul>
-<p>  </p>
+<p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; ">
 <li class="listitem" style="list-style-type: none">
@@ -118,7 +120,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.compose.html">Settings for composing emails</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.new">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html
index 6bebb4b627e3612ee1fa6a1c2adebf443b360f7e..647965629321cf57f4245a110042f5e6ce472809 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.reply.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
 <link rel="next" href="ox.appsuite.user.sect.email.send.forward.html" title="Forwarding emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.reply">
 <div class="titlepage"><div><div><h3 class="title">Replying to emails</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.11.2"></a><p id="ox.appsuite.user.concept.email.send.reply">When replying to an email, some of the email's input fields are pre-filled: </p>
+<a class="indexterm" name="id-1.6.11.13.2"></a><p id="ox.appsuite.user.concept.email.send.reply">When replying to an email, some of the email's input fields are pre-filled: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">The sender of the email and additional recipients of the email will be automatically entered as recipients of the reply email.</p></li>
 <li class="listitem"><p role="presentation">The email subject will be entered in the subject field of the reply email. The subject will be preceded with the text "Re: ".</p></li>
@@ -44,9 +44,9 @@
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step"><p role="presentation">Select an email.</p></li>
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Reply to sender</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span> in the toolbar. To also reply to all other recipients click the <span class="guibutton"><strong>Reply to all recipients</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span>.</p>
+<p role="presentation">In the toolbar, click the <span class="guibutton"><strong>Reply to sender</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.reply"><object type="image/svg+xml" data="../../images/reply.svg" height="15"></object></span>. To also reply to all other recipients click the <span class="guibutton"><strong>Reply to all recipients</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></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">Use the <span class="guibutton"><strong>Reply to all recipients</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.reply.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span> or the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.reply.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view.</p></li>
+<li class="listitem"><p role="presentation">In the detail view, use the <span class="guibutton"><strong>Reply to all recipients</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.reply.replyall"><object type="image/svg+xml" data="../../images/reply-all.svg" height="15"></object></span>  Or the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.reply.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
 <li class="listitem"><p role="presentation">Use the context menu in the email list view.</p></li>
 </ul></p>
 <p role="presentation">To send a new email to the sender and the other recipients, click the <span class="guibutton"><strong>More actions</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.task.email.send.reply.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the detail view. Click on <span class="guibutton"><strong>Send new email</strong></span>.</p>
@@ -68,7 +68,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.forward.html">Forwarding emails</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.vacationnotice.html">Sending a vacation notice automatically</a></p>
 </li></ul>
-<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.reply">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html
index daf82b9d2da778b7061613c060fedae10e488bc3..1e240a786b6e63c501c0b6264534f1786a000b62 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.replyto.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.sender.html" title="Selecting a sender address">
 <link rel="next" href="ox.appsuite.user.sect.email.send.attachments.html" title="Adding attachments">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.replyto">
 <div class="titlepage"><div><div><h3 class="title">Setting reply-to address</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.7.2"></a><p id="ox.appsuite.user.concept.email.send.replyto">By default, when a recipient replies to your email, the reply is sent to the email account from which you sent the email. Alternatively, you can use the email editing window to specify the email addresses to which the reply to the sent email will be sent.</p>
@@ -56,7 +56,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.dataorganisation.accounts.primarymail.html">Editing the primary email account</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.replyto">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
index f18ff60256291df531431d0c69a20e399c72d061..b0c372a0b620759d02a224919ca2d593e4b4b977 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.sender.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.new.html" title="Sending a new email">
 <link rel="next" href="ox.appsuite.user.sect.email.send.replyto.html" title="Setting reply-to address">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,7 +30,7 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.sender">
 <div class="titlepage"><div><div><h3 class="title">Selecting a sender address</h3></div></div></div>
 <a class="indexterm" name="id-1.6.11.6.2"></a><p id="ox.appsuite.user.concept.email.send.sender">If sending an email, you can set the sender address to be shown to the recipient, in the email editing window.</p>
@@ -58,7 +58,7 @@
 <p> </p>
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.sender">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
index 9d712b429c7b6106cd5a7a41c2994e613570eff7..615feec3453824df76477a77fab1d50e8b88e0ba 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.signatures.html
@@ -5,8 +5,8 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
-<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="Sending attachments as link">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.templates.html" title="Using templates">
 <link rel="next" href="ox.appsuite.user.sect.email.send.reply.html" title="Replying to emails">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
       <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
@@ -22,7 +22,7 @@
 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
 </div>
 <div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
-<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Prev</a></li>
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.templates.html">Prev</a></li>
 <li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
 <li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
 <li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.reply.html">Next</a></li>
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.signatures">
 <div class="titlepage"><div><div><h3 class="title">Using signatures</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.10.2"></a><a class="indexterm" name="id-1.6.11.10.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">An email signature is text that will be entered automatically in the email when being composed or replied to or forwarded. It is typically used for inserting the name, company, and contact address at the bottom of the email text. You can create signatures in the plain text or html format. The following functions are available: </p>
+<a class="indexterm" name="id-1.6.11.12.2"></a><a class="indexterm" name="id-1.6.11.12.3"></a><p id="ox.appsuite.user.concept.email.send.signatures">An email signature is text that will be entered automatically in the email when being composed or replied to or forwarded. It is typically used for inserting the name, company, and contact address at the bottom of the email text. You can create signatures in the plain text or html format. The following functions are available: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">create new signature, edit existing signatures</p></li>
 <li class="listitem"><p role="presentation">set default signatures for an email account</p></li>
@@ -43,7 +43,7 @@
 <p class="title">How to create or edit a signature:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.signatures.addmanage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.signatures.addmanage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
 <li class="step">
@@ -80,7 +80,7 @@
 <div class="task" id="ox.appsuite.user.task.email.send.signatures.add">
 <p class="title">How to add a signature to the email text in the email editing window:</p>
 <div class="procedure"><ol class="procedure" type="1">
-<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Options</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.signatures.add.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> in the button bar.</p></li>
+<li class="step"><p role="presentation">Click the <span class="guibutton"><strong>Options</strong></span> icon<span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.signatures.add.options"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>in the button bar.</p></li>
 <li class="step"><p role="presentation">Select a signature from the list.</p></li>
 </ol></div>
 </div>
@@ -89,8 +89,11 @@
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
 <p> </p>
 <p class="title">Related topics:</p>
-<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p></li></ul>
-<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.accounts.html">Adding Email Accounts</a></p>
+<p role="presentation" class="feat-io-ox-core-templates"><a class="xref" href="ox.appsuite.user.sect.email.send.templates.html">Using templates</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.email.send.signatures">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html b/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html
new file mode 100644
index 0000000000000000000000000000000000000000..dbf0522914ed760c9a91423836a7d3e75bb351eb
--- /dev/null
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.templates.html
@@ -0,0 +1,97 @@
+<html lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Using templates</title>
+<link rel="stylesheet" type="text/css" href="../../../help/help.css">
+<meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
+<link rel="home" href="index.html" title="User Guide">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
+<link rel="prev" href="ox.appsuite.user.sect.email.send.attachmentlink.html" title="send attachments as link">
+<link rel="next" href="ox.appsuite.user.sect.email.send.signatures.html" title="Using signatures">
+<link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
+      <link rel="stylesheet" type="text/css" href="../../../help/bootstrap.min.css"​/> 
+      <link id="favicon" rel="shortcut icon" href="../../../apps/themes/default/favicon.ico" type="image/x-icon"> 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+       <script src="../../../help/jquery.min.js"></script> 
+    
+       <script src="../../../help/bootstrap.min.js"></script> 
+    </head>
+<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<div class="oxhelp-navigation-top"><nav class="navbar navbar-inverse" role="navigation"><div class="container-fluid">
+<div class="navbar-header">
+<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#ox-main-nav"><span class="sr-only">Toggle navigation</span><span class="icon-bar"></span><span class="icon-bar"></span><span class="icon-bar"></span></button><a class="navbar-brand"></a>
+</div>
+<div class="collapse navbar-collapse" id="ox-main-nav"><ul class="nav navbar-nav">
+<li><a accesskey="p" class="oxhelp-prev-link" href="ox.appsuite.user.sect.email.send.attachmentlink.html">Prev</a></li>
+<li><a accesskey="h" href="index.html" class="oxhelp-home-link">Start Page</a></li>
+<li><a accesskey="t" href="bk01-toc.html" class="oxhelp-toc-link">Table Of Contents</a></li>
+<li><a accesskey="n" class="oxhelp-next-link" href="ox.appsuite.user.sect.email.send.signatures.html">Next</a></li>
+</ul></div>
+</div></nav></div>
+<div class="oxhelp-content">
+  <h1 class="sr-only"><span class="phrase">Email</span></h1>
+<h2 class="sr-only">Send emails</h2>
+<div class="sect2" id="ox.appsuite.user.sect.email.send.templates">
+<div class="titlepage"><div><div><h3 class="title">Using templates</h3></div></div></div>
+<a class="indexterm" name="id-1.6.11.11.2"></a><a class="indexterm" name="id-1.6.11.11.3"></a><p id="ox.appsuite.user.concept.email.send.templates">Templates are text modules that you can write once and then insert into your emails as often as you like. As a result, you only have to write frequently used phrases once. Templates, signatures and email drafts differ in the following ways: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">Templates can be inserted into an email multiple times at any place and can be edited.</p></li>
+<li class="listitem"><p role="presentation">A signature will be inserted automatically at the email’s beginning or end.</p></li>
+<li class="listitem"><p role="presentation">An email draft is a complete email including recipients, attachments and the text which is either completed or a draft.</p></li>
+</ul>
+<p> The following functions are available: </p>
+<ul class="itemizedlist" style="list-style-type: disc; ">
+<li class="listitem"><p role="presentation">create new template, edit existing templates</p></li>
+<li class="listitem"><p role="presentation">delete a template</p></li>
+<li class="listitem"><p role="presentation">insert a template into the email text</p></li>
+</ul>
+<div class="task" id="ox.appsuite.user.task.email.send.templates.addmanage">
+<p class="title">How to create or edit a template:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step">
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.templates.addmanage.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>. The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
+<p role="presentation">Click on <span class="guibutton"><strong>Mail</strong></span> in the left pane. Click on <span class="guibutton"><strong>Templates</strong></span>.</p>
+<p role="presentation">You can also click the <span class="guibutton"><strong>Insert template</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.templates.addmanage.templates"><object type="image/svg+xml" data="../../images/file-text.svg" height="15"></object></span>  in the email editing window. Click on <span class="guibutton"><strong>Edit templates</strong></span>.</p>
+<p role="presentation">The existing templates will be shown.</p>
+</li>
+<li class="step">
+<p role="presentation">To add a new template, proceed as follows:</p>
+<ol type="a" class="substeps">
+<li class="step"><p role="presentation">Click on <span class="guibutton"><strong>Create template</strong></span>. The <span class="guilabel"><strong>Create template</strong></span> window opens.</p></li>
+<li class="step">
+<p role="presentation">Enter a title for the template.</p>
+<p role="presentation">Enter the text for the template. You can use the formatting bar to format the text.</p>
+</li>
+</ol>
+</li>
+<li class="step">
+<p role="presentation">To edit an existing template, click on <span class="guibutton"><strong>Edit</strong></span> next to the title.</p>
+<p role="presentation">In order to delete an existing template, click the <span class="guibutton"><strong>Delete</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.templates.addmanage.delete"><object type="image/svg+xml" data="../../images/trash.svg" height="15"></object></span> next to the title.</p>
+</li>
+</ol></div>
+</div>
+<div class="task" id="ox.appsuite.user.task.email.send.templates.add">
+<p class="title">How to add a template to the email text in the email editing window:</p>
+<div class="procedure"><ol class="procedure" type="1">
+<li class="step"><p role="presentation">Place the cursor at the position where you want to insert the template.</p></li>
+<li class="step">
+<p role="presentation">Click the <span class="guibutton"><strong>Insert template</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.templates.add.templates"><object type="image/svg+xml" data="../../images/file-text.svg" height="15"></object></span>  in the button bar.</p>
+<p role="presentation">The existing templates will be shown.</p>
+</li>
+<li class="step"><p role="presentation">Select a template from the list.</p></li>
+</ol></div>
+</div>
+<p id="ox.appsuite.user.related.email.send.templates"></p>
+<p class="title">Superordinated action:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.new.html">Sending a new email</a></p></li></ul>
+<p> </p>
+<p class="title">Related topics:</p>
+<ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.send.signatures.html">Using signatures</a></p>
+<p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.manage.draft.html">Using email drafts</a></p>
+</li></ul>
+<p id="ox.appsuite.user.parent.email.send.templates">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
+</div>
+          </div>
+        </body>
+</html>
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 08a89af7253dfb1d9c84711ced7e6fdfd603af96..b866f936e0c04438f37e3b2b6b1c2f0fac571614 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.send.vacationnotice.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" type="text/css" href="../../../help/help.css">
 <meta name="generator" content="DocBook XSL Stylesheets V1.78.1">
 <link rel="home" href="index.html" title="User Guide">
-<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Sending Emails">
+<link rel="up" href="ox.appsuite.user.sect.email.send.html" title="Send emails">
 <link rel="prev" href="ox.appsuite.user.sect.email.send.attendees.html" title="Sending an email to appointment participants">
 <link rel="next" href="ox.appsuite.user.sect.email.call.html" title="Calling the Sender or Another Recipient">
 <link rel="copyright" href="ox.appsuite.user.legalnotice.html" title="Legal Notice">
@@ -30,10 +30,10 @@
 </div></nav></div>
 <div class="oxhelp-content">
   <h1 class="sr-only"><span class="phrase">Email</span></h1>
-<h2 class="sr-only">Sending Emails</h2>
+<h2 class="sr-only">Send emails</h2>
 <div class="sect2" id="ox.appsuite.user.sect.email.send.vacationnotice">
 <div class="titlepage"><div><div><h3 class="title">Sending a vacation notice automatically</h3></div></div></div>
-<a class="indexterm" name="id-1.6.11.15.2"></a><a class="indexterm" name="id-1.6.11.15.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">A vacation notice informs the sender of an email that you will not retrieve your emails for a specific period of time. You can set the following: </p>
+<a class="indexterm" name="id-1.6.11.17.2"></a><a class="indexterm" name="id-1.6.11.17.3"></a><p id="ox.appsuite.user.concept.email.send.vacationnotice">A vacation notice informs the sender of an email that you will not retrieve your emails for a specific period of time. You can set the following: </p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p role="presentation">the subject and text of the vacation notice</p></li>
 <li class="listitem"><p role="presentation">the time frame when the vacation notice is active</p></li>
@@ -43,7 +43,7 @@
 <p class="title">How to create and activate a vacation notice:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.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>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.send.vacationnotice.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>Vacation notice</strong></span>.</p>
 <p role="presentation">You can also use the <span class="guibutton"><strong>Vacation notice</strong></span> button in the email settings.</p>
 <p role="presentation">The <span class="guilabel"><strong>Vacation notice</strong></span> window opens.</p>
 </li>
@@ -85,7 +85,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.settings.receive.html">Settings for receiving emails</a></p>
 </li>
 </ul>
-<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Sending Emails</a></p>
+<p id="ox.appsuite.user.parent.email.send.vacationnotice">Parent topic: <a class="xref" href="ox.appsuite.user.sect.email.send.html">Send emails</a></p>
 </div>
           </div>
         </body>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
index 65a8314551671aad6aa02f5f4c3162924358c4e1..a76930a848222318d3c7bafea1ba7df98573b0dd 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.compose.html
@@ -37,7 +37,7 @@
 <p class="title">How to use the settings for composing emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.settings.compose.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.settings.compose.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
index a6bd561f2938980142b8a60f2235a3abc80492c0..6cc9b0ee896e2d2e40c73d85a2985825b69890fc 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.email.settings.receive.html
@@ -37,7 +37,7 @@
 <p class="title">How to use the settings for receiving emails:</p>
 <div class="procedure"><ol class="procedure" type="1">
 <li class="step">
-<p role="presentation">Click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.settings.receive.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> in the menu bar. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
+<p role="presentation">In the menu bar, click the <span class="guibutton"><strong>Settings</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.settings.receive.settings"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>. Click on <span class="guibutton"><strong>All settings</strong></span>.</p>
 <p role="presentation">You can also click on <span class="guibutton"><strong>Settings</strong></span> in the App Launcher.</p>
 <p role="presentation">The <span class="guilabel"><strong>Settings</strong></span> window opens.</p>
 </li>
@@ -59,7 +59,7 @@
 <h4 class="title">Message list options</h4>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.list.preview"><b>show text preview. </b><a class="indexterm" name="id-1.6.19.7.6.2.1.1.1.2"></a>Defines whether the first words of the mail content will be displayed in the email list view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.list.datetime"><b>Showing date and time. </b><a class="indexterm" name="id-1.6.19.7.6.2.1.2.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.list.datetime"><b>show date and time. </b><a class="indexterm" name="id-1.6.19.7.6.2.1.2.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.receive.list.size"><b>show message size. </b><a class="indexterm" name="id-1.6.19.7.6.2.1.3.1.2"></a>Defines whether an email’s size will be displayed in the email list view.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.email.settings.receive.display"></p>
@@ -70,7 +70,7 @@
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.fixedfont"><b>Use fixed-width font for text mails. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.3.1.2"></a>Specifies whether a fixed-width font is used when displaying a plain text email.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.deliveryreceipt"><b>show requests for read receipts. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.4.1.2"></a>Defines whether a return receipt is displayed if a received email includes receipt confirmation request.</p></li>
 <li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.unreadfolder"><b>show folder with all unseen messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.5.1.2"></a>Defines whether the <span class="guibutton"><strong>Unread </strong></span> folder is displayed in the folder view.</p></li>
-<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.markedfolder"><b>Show folder with all flagged messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.6.1.2"></a>Defines whether the <span class="guibutton"><strong>Flagged </strong></span> folder is displayed in the folder view.</p></li>
+<li class="listitem"><p id="ox.appsuite.user.reference.email.settings.receive.display.markedfolder"><b>show folder with all flagged messages. </b><a class="indexterm" name="id-1.6.19.7.7.2.1.6.1.2"></a>Defines whether the <span class="guibutton"><strong>Flagged </strong></span> folder is displayed in the folder view.</p></li>
 </ul>
 <p id="ox.appsuite.user.reference.email.settings.receive.markasread"></p>
 <h4 class="title">mark as read</h4>
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 547f542cdf167646541d62480876603aa3eb12a1..32d18baf37c59be78b7af89e0daafb453be7dc8e 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
@@ -45,10 +45,10 @@
 <p role="presentation">Click on an email in the list view. The content of the email will be displayed in the detail view.</p>
 <ul class="itemizedlist" style="list-style-type: disc; ">
 <li class="listitem">
-<p role="presentation">If you enable the <span class="guibutton"><strong>Conversations</strong></span> option in the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.view.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list view, all emails of a conversation will be shown as a list.</p>
+<p role="presentation">If you enable the <span class="guibutton"><strong>Conversations</strong></span> option in the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.view.actions"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list view, all emails of a conversation will be displayed as thread.</p>
 <p role="presentation">To open or close an email that is part of a conversation, click on a free area next to the sender.</p>
 </li>
-<li class="listitem"><p role="presentation">If the email includes a quote from a previous email, you can display the quote by clicking the <span class="guibutton"><strong>Show quoted text</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.view.showquoted"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">If the email includes a quote from a previous email, you can display the quote by clicking the <span class="guibutton"><strong>Show quoted text</strong></span> icon <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.email.view.showquoted"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> .</p></li>
 </ul>
 </li>
 </ol></div>
@@ -64,10 +64,10 @@
 <p role="presentation">To sort the E-Mail list, use the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.options.email.view.actions.sort"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> above the list view.</p>
 <p role="presentation">The sorting setting will be applied to the selected email folder. You can use different settings for the single folders.</p>
 </li>
-<li class="listitem"><p role="presentation">To combine all emails of a conversation in a single list entry in the list view, enable the <span class="guibutton"><strong>Conversations</strong></span> checkbox in the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.options.email.view.actions.group"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span>.</p></li>
-<li class="listitem"><p role="presentation">To select a layout or to change the list view layout, use the entries below <span class="guibutton"><strong>Layout</strong></span> or <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.options.email.view.settings.layout"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span>.</p></li>
+<li class="listitem"><p role="presentation">To combine all emails of a conversation in a single list entry in the list view, enable the <span class="guibutton"><strong>Conversations</strong></span> checkbox in the <span class="guibutton"><strong>More options</strong></span> menu <span aria-hidden="true" class="inlinemediaobject" id="ox.appsuite.user.fig.options.email.view.actions.group"><object type="image/svg+xml" data="../../images/three-dots.svg" height="15"></object></span> .</p></li>
+<li class="listitem"><p role="presentation">To select a layout or to adjust the list view, use the entries below <span class="guibutton"><strong>Layout</strong></span> or <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.options.email.view.settings.layout"><object type="image/svg+xml" data="../../images/gear.svg" height="15"></object></span> .</p></li>
 <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>
+<li class="listitem"><p role="presentation">If you select the <span class="guibutton"><strong>List</strong></span> layout in the <span class="guibutton"><strong>Settings</strong></span> menu <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.related.email.view"></p>
@@ -77,7 +77,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.list.html">The <span class="phrase">Email</span> list view</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.email.gui.detailview.html">The <span class="phrase">Email</span> detail view</a></p>
 </li></ul>
-<p> </p>
+<p>  </p>
 <p class="title">Related topics:</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.guard.drive.encrypt.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.encrypt.html
index 6e3d72e6aa35a88fcac30233187580462478a946..3ef9705bcbc362587212a540c3d4e59adf2e7c87 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.encrypt.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.encrypt.html
@@ -49,7 +49,7 @@
 <p id="ox.appsuite.user.related.guard.drive.encrypt"></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.drive.manage.versions.html">Working with versions</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.manage.versions.html">work with versions</a></p></li>
 <li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.upload.html">Uploading files securely by using encryption</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.open.html">Opening encrypted files</a></p>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.upload.html b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.upload.html
index 02e4e1ba27c24e349f14a557e2827c3723ad95b8..dee03aa93f1b88cc1b3ba38c71e527500ba5b845 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.upload.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.guard.drive.upload.html
@@ -62,7 +62,7 @@
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.download.html">Downloading encrypted files</a></p>
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.guard.drive.decrypt.html">Decrypting files</a></p>
 </li>
-<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Uploading Files or Folders</a></p></li>
+<li class="listitem" style="list-style-type: none"><p role="presentation"><a class="xref" href="ox.appsuite.user.sect.drive.upload.html">Upload files or folders</a></p></li>
 </ul>
 <p id="ox.appsuite.user.parent.guard.drive.upload">Parent topic: <a class="xref" href="ox.appsuite.user.sect.guard.drive.html">Encrypting or Decrypting Files</a></p>
 </div>
diff --git a/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.html b/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.html
index 60d921ac788f0fbfc9938c56adba6929dc6748f1..99fb2af54b5d2bc2b7ea99b0862f363b481b90d5 100644
--- a/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.html
+++ b/help/l10n/en_US/ox.appsuite.user.sect.tasks.add.html
@@ -43,7 +43,7 @@
 <p class="title">Related topics:</p>
 <ul class="itemizedlist" style="list-style-type: none; "><li class="listitem" style="list-style-type: none">
 <p role="presentation"><a class="xref" href="ox.appsuite.user.sect.tasks.manage.import.html">Importing tasks</a></p>
-<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Creating Appointments</a></p>
+<p role="presentation" class="cap-calendar"><a class="xref" href="ox.appsuite.user.sect.calendar.add.html">Create appointments</a></p>
 </li></ul>
 <p id="ox.appsuite.user.parent.tasks.add">Parent topic: <a class="xref" href="ox.appsuite.user.chap.tasks.html"><i><span class="phrase">Tasks</span></i></a></p>
 </div>