diff --git a/dev/Common/Plugins.js b/dev/Common/Plugins.js
index 47c658d2c..577c4bff0 100644
--- a/dev/Common/Plugins.js
+++ b/dev/Common/Plugins.js
@@ -1,3 +1,4 @@
+import ko from 'ko';
 import { settingsAddViewModel } from 'Screen/AbstractSettings';
 import { SettingsGet } from 'Common/Globals';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
@@ -15,6 +16,35 @@ rl.pluginRemoteRequest = (callback, action, parameters, timeout) => {
 	rl.app.Remote.request('Plugin' + action, callback, parameters, timeout);
 };
 
+/**
+ * Navigation entries contributed by plugins, rendered in the folder list
+ * toolbar beside Compose and Contacts.
+ * @type {Array}
+ */
+export const pluginNavEntries = ko.observableArray();
+
+/**
+ * Register a navigation entry for a screen a plugin provides.
+ *
+ * Without this a plugin that adds a screen has to reach into the folder list
+ * template itself, which several already do, each in its own way.
+ *
+ * @param {Object} entry
+ * @param {string} entry.icon  character or glyph shown on the button
+ * @param {string} entry.title tooltip
+ * @param {string=} entry.hash location hash to navigate to
+ * @param {Function=} entry.click called instead of setting the hash
+ */
+rl.addNavEntry = entry => {
+	if (entry && entry.icon) {
+		pluginNavEntries.push({
+			icon: entry.icon,
+			title: entry.title || '',
+			click: entry.click || (() => { hasher.setHash(entry.hash || ''); })
+		});
+	}
+};
+
 /**
  * @param {Function} SettingsViewModelClass
  * @param {string} labelName
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index d8f60fe78..e5aa33f8e 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -7,6 +7,7 @@ import { mailBox, settings } from 'Common/Links';
 import { addComputablesTo } from 'External/ko';
 
 import { AppUserStore } from 'Stores/User/App';
+import { pluginNavEntries } from 'Common/Plugins';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessageUserStore } from 'Stores/User/Message';
@@ -36,6 +37,7 @@ export class MailFolderList extends AbstractViewLeft {
 		this.moveAction = moveAction;
 
 		this.allowContacts = AppUserStore.allowContacts();
+		this.pluginNavEntries = pluginNavEntries;
 
 		this.foldersFilter = foldersFilter;
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
index 3103049a1..7bc47edda 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailFolderList.html
@@ -5,6 +5,9 @@
 			<span class="buttonComposeText" data-i18n="FOLDER_LIST/BUTTON_NEW_MESSAGE"></span>
 		</a>
 		<a class="btn buttonContacts fontastic" data-bind="visible: allowContacts, click: contactsClick" data-i18n="[title]GLOBAL/CONTACTS">📇</a>
+		<!-- ko foreach: pluginNavEntries -->
+		<a class="btn buttonPluginNav fontastic" data-bind="text: icon, attr: { title: title }, click: click"></a>
+		<!-- /ko -->
 	</div>
 	<div class="b-content">
 		<ul class="b-folders-system" data-bind="foreach: systemFolders">