diff --git a/api/js/etemplate/et2_widget_placeholder.js b/api/js/etemplate/et2_widget_placeholder.js
new file mode 100644
index 0000000000..963bf186c6
--- /dev/null
+++ b/api/js/etemplate/et2_widget_placeholder.js
@@ -0,0 +1,462 @@
+"use strict";
+/**
+ * EGroupware eTemplate2 - JS Placeholder widgets
+ *
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @package etemplate
+ * @subpackage api
+ * @link https://www.egroupware.org
+ * @author Nathan Gray
+ * @copyright Nathan Gray 2021
+ */
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.et2_placeholder_snippet_select = exports.et2_placeholder_select = void 0;
+/*egw:uses
+    et2_core_inputWidget;
+    et2_core_valueWidget;
+    et2_widget_description;
+*/
+var et2_core_widget_1 = require("./et2_core_widget");
+var et2_core_inheritance_1 = require("./et2_core_inheritance");
+var et2_widget_dialog_1 = require("./et2_widget_dialog");
+var et2_core_inputWidget_1 = require("./et2_core_inputWidget");
+/**
+ * Display a dialog to choose a placeholder
+ */
+var et2_placeholder_select = /** @class */ (function (_super) {
+    __extends(et2_placeholder_select, _super);
+    /**
+     * Constructor
+     *
+     * @param _parent
+     * @param _attrs
+     * @memberOf et2_vfsSelect
+     */
+    function et2_placeholder_select(_parent, _attrs, _child) {
+        var _this = 
+        // Call the inherited constructor
+        _super.call(this, _parent, _attrs, et2_core_inheritance_1.ClassWithAttributes.extendAttributes(et2_placeholder_select._attributes, _child || {})) || this;
+        _this.LIST_URL = 'EGroupware\\Api\\Etemplate\\Widget\\Placeholder::ajax_get_placeholders';
+        _this.TEMPLATE = '/api/templates/default/insert_merge_placeholder.xet?1';
+        // Allow no child widgets
+        _this.supportedWidgetClasses = [];
+        return _this;
+    }
+    et2_placeholder_select.prototype._content = function (_content, _callback) {
+        var self = this;
+        if (this.dialog && this.dialog.div) {
+            this.dialog.div.dialog('close');
+        }
+        var callback = _callback || this._buildDialog;
+        if (et2_placeholder_select.placeholders === null) {
+            this.egw().loading_prompt('placeholder_select', true, '', 'body');
+            this.egw().json(this.LIST_URL, [], function (_content) {
+                if (typeof _content === 'object' && _content.message) {
+                    // Something went wrong
+                    this.egw().message(_content.message, 'error');
+                    return;
+                }
+                this.egw().loading_prompt('placeholder_select', false);
+                et2_placeholder_select.placeholders = _content;
+                callback.apply(self, arguments);
+            }.bind(this)).sendRequest(true);
+        }
+        else {
+            this._buildDialog(et2_placeholder_select.placeholders);
+        }
+    };
+    /**
+     * Builds placeholder selection dialog
+     *
+     * @param {object} _data content
+     */
+    et2_placeholder_select.prototype._buildDialog = function (_data) {
+        var _this = this;
+        var _a;
+        var self = this;
+        var buttons = [
+            {
+                text: this.egw().lang("Insert"),
+                id: "submit",
+                image: "export"
+            }
+        ];
+        var extra_buttons_action = {};
+        if (this.options.extra_buttons && this.options.method) {
+            for (var i = 0; i < this.options.extra_buttons.length; i++) {
+                delete (this.options.extra_buttons[i]['click']);
+                buttons.push(this.options.extra_buttons[i]);
+                extra_buttons_action[this.options.extra_buttons[i]['id']] = this.options.extra_buttons[i]['id'];
+            }
+        }
+        buttons.push({ text: this.egw().lang("Cancel"), id: "cancel", image: "cancel" });
+        var data = {
+            content: { app: '', group: '', entry: {} },
+            sel_options: { app: [], group: [] },
+            modifications: {
+                outer_box: {
+                    entry: {
+                        application_list: []
+                    }
+                }
+            }
+        };
+        Object.keys(_data).map(function (key) {
+            data.sel_options.app.push({
+                value: key,
+                label: _this.egw().lang(key)
+            });
+        });
+        data.sel_options.group = this._get_group_options(Object.keys(_data)[0]);
+        data.content.app = data.sel_options.app[0].value;
+        data.content.group = (_a = data.sel_options.group[0]) === null || _a === void 0 ? void 0 : _a.value;
+        data.content.entry = { app: data.content.app };
+        data.modifications.outer_box.entry.application_list = Object.keys(_data);
+        // Remove non-app placeholders (user & general)
+        var non_apps = ['user', 'general'];
+        for (var i = 0; i < non_apps.length; i++) {
+            var index = data.modifications.outer_box.entry.application_list.indexOf(non_apps[i]);
+            data.modifications.outer_box.entry.application_list.splice(index, 1);
+        }
+        // callback for dialog
+        this.submit_callback = function (submit_button_id, submit_value) {
+            if ((submit_button_id == 'submit' || (extra_buttons_action && extra_buttons_action[submit_button_id])) && submit_value) {
+                this._do_insert_callback(submit_value);
+                return true;
+            }
+        }.bind(this);
+        this.dialog = et2_core_widget_1.et2_createWidget("dialog", {
+            callback: this.submit_callback,
+            title: this.egw().lang(this.options.dialog_title) || this.egw().lang("Insert Placeholder"),
+            buttons: buttons,
+            minWidth: 500,
+            minHeight: 400,
+            width: 400,
+            value: data,
+            template: this.egw().webserverUrl + this.TEMPLATE,
+            resizable: true
+        }, et2_widget_dialog_1.et2_dialog._create_parent('api'));
+        this.dialog.template.uniqueId = 'api.insert_merge_placeholder';
+        this.dialog.div.on('load', this._on_template_load.bind(this));
+    };
+    et2_placeholder_select.prototype.doLoadingFinished = function () {
+        this._content.call(this, null);
+        return true;
+    };
+    /**
+     * Post-load of the dialog
+     * Bind internal events, set some things that are difficult to do in the template
+     */
+    et2_placeholder_select.prototype._on_template_load = function () {
+        var _this = this;
+        var app = this.dialog.template.widgetContainer.getDOMWidgetById("app");
+        var group = this.dialog.template.widgetContainer.getDOMWidgetById("group");
+        var placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list");
+        var preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder");
+        var entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry");
+        placeholder_list.set_select_options(this._get_placeholders(app.get_value(), group.get_value()));
+        // Further setup / styling that can't be done in etemplate
+        this.dialog.template.DOMContainer.style.display = "flex";
+        this.dialog.template.DOMContainer.firstChild.style.display = "flex";
+        group.getDOMNode().size = 5;
+        placeholder_list.getDOMNode().size = 5;
+        // Bind some handlers
+        app.onchange = function (node, widget) {
+            preview.set_value("");
+            if (['user', 'filemanager'].indexOf(widget.get_value()) >= 0) {
+                // These ones don't let you select an entry for preview (they don't work)
+                entry.set_disabled(true);
+                entry.app_select.val('user');
+                entry.set_value({ app: 'user', id: '', query: '' });
+            }
+            else if (widget.get_value() == 'general') {
+                // Don't change entry app, leave it
+                entry.set_disabled(false);
+            }
+            else {
+                entry.set_disabled(false);
+                entry.app_select.val(widget.get_value());
+                entry.set_value({ app: widget.get_value(), id: '', query: '' });
+            }
+            var groups = _this._get_group_options(widget.get_value());
+            group.set_select_options(groups);
+            group.set_value(groups[0].value);
+            group.onchange();
+        };
+        group.onchange = function (select_node, select_widget) {
+            var options = _this._get_placeholders(app.get_value(), group.get_value());
+            placeholder_list.set_select_options(options);
+            preview.set_value("");
+            placeholder_list.set_value(options[0].value);
+        };
+        placeholder_list.onchange = this._on_placeholder_select.bind(this);
+        entry.onchange = this._on_placeholder_select.bind(this);
+        this.dialog.template.widgetContainer.getDOMWidgetById("insert_placeholder").onclick = function () {
+            _this.options.insert_callback(_this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder").getDOMNode().textContent);
+        };
+        this.dialog.template.widgetContainer.getDOMWidgetById("insert_content").onclick = function () {
+            _this.options.insert_callback(_this.dialog.template.widgetContainer.getDOMWidgetById("preview_content").getDOMNode().textContent);
+        };
+        app.set_value(app.get_value());
+    };
+    /**
+     * User has selected a placeholder
+     * Update the UI, and if they have an entry selected do the replacement and show that.
+     */
+    et2_placeholder_select.prototype._on_placeholder_select = function () {
+        var app = this.dialog.template.widgetContainer.getDOMWidgetById("app");
+        var entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry");
+        var placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list");
+        var preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder");
+        var preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content");
+        // Show the selected placeholder
+        this.set_value(placeholder_list.get_value());
+        preview.set_value(placeholder_list.get_value());
+        preview.getDOMNode().parentNode.style.visibility = placeholder_list.get_value().trim() ? null : 'hidden';
+        if (placeholder_list.get_value() && entry.get_value()) {
+            // Show the selected placeholder replaced with value from the selected entry
+            this.egw().json('EGroupware\\Api\\Etemplate\\Widget\\Placeholder::ajax_fill_placeholders', [placeholder_list.get_value(), entry.get_value()], function (_content) {
+                if (!_content) {
+                    _content = '';
+                }
+                preview_content.set_value(_content);
+                preview_content.getDOMNode().parentNode.style.visibility = _content.trim() ? null : 'hidden';
+            }.bind(this)).sendRequest(true);
+        }
+        else {
+            // No value, hide the row
+            preview_content.getDOMNode().parentNode.style.visibility = 'hidden';
+        }
+    };
+    /**
+     * Get the list of placeholder groups under the selected application
+     * @param appname
+     * @returns {value:string, label:string}[]
+     */
+    et2_placeholder_select.prototype._get_group_options = function (appname) {
+        var _this = this;
+        var options = [];
+        Object.keys(et2_placeholder_select.placeholders[appname]).map(function (key) {
+            // @ts-ignore
+            if (Object.keys(et2_placeholder_select.placeholders[appname][key]).filter(function (key) { return isNaN(key); }).length > 0) {
+                // Handle groups of groups
+                if (typeof et2_placeholder_select.placeholders[appname][key].label !== "undefined") {
+                    options[key] = et2_placeholder_select.placeholders[appname][key];
+                }
+                else {
+                    options[_this.egw().lang(key)] = [];
+                    for (var _i = 0, _a = Object.keys(et2_placeholder_select.placeholders[appname][key]); _i < _a.length; _i++) {
+                        var sub = _a[_i];
+                        if (!et2_placeholder_select.placeholders[appname][key][sub]) {
+                            continue;
+                        }
+                        options[_this.egw().lang(key)].push({
+                            value: key + '-' + sub,
+                            label: _this.egw().lang(sub)
+                        });
+                    }
+                }
+            }
+            else {
+                options.push({
+                    value: key,
+                    label: _this.egw().lang(key)
+                });
+            }
+        });
+        return options;
+    };
+    /**
+     * Get a list of placeholders under the given application + group
+     *
+     * @param appname
+     * @param group
+     * @returns {value:string, label:string}[]
+     */
+    et2_placeholder_select.prototype._get_placeholders = function (appname, group) {
+        var _group = group.split('-', 2);
+        var ph = et2_placeholder_select.placeholders[appname];
+        for (var i = 0; typeof ph !== "undefined" && i < _group.length; i++) {
+            ph = ph[_group[i]];
+        }
+        return ph || [];
+    };
+    /**
+     * Get the correct insert text call the insert callback with it
+     *
+     * @param dialog_values
+     */
+    et2_placeholder_select.prototype._do_insert_callback = function (dialog_values) {
+        this.options.insert_callback(this.get_value());
+    };
+    et2_placeholder_select.prototype.set_value = function (value) {
+        this.value = value;
+    };
+    et2_placeholder_select.prototype.getValue = function () {
+        return this.value;
+    };
+    et2_placeholder_select._attributes = {
+        insert_callback: {
+            "name": "Insert callback",
+            "description": "Method called with the selected placeholder text",
+            "type": "js"
+        },
+        dialog_title: {
+            "name": "Dialog title",
+            "type": "string",
+            "default": "Insert Placeholder"
+        }
+    };
+    et2_placeholder_select.placeholders = null;
+    return et2_placeholder_select;
+}(et2_core_inputWidget_1.et2_inputWidget));
+exports.et2_placeholder_select = et2_placeholder_select;
+;
+et2_core_widget_1.et2_register_widget(et2_placeholder_select, ["placeholder-select"]);
+/**
+ * Display a dialog to choose from a set list of placeholder snippets
+ */
+var et2_placeholder_snippet_select = /** @class */ (function (_super) {
+    __extends(et2_placeholder_snippet_select, _super);
+    function et2_placeholder_snippet_select() {
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.LIST_URL = 'EGroupware\\Api\\Etemplate\\Widget\\Placeholder::ajax_get_placeholders';
+        _this.TEMPLATE = '/api/templates/default/placeholder_snippet.xet?1';
+        return _this;
+    }
+    /**
+     * Post-load of the dialog
+     * Bind internal events, set some things that are difficult to do in the template
+     */
+    et2_placeholder_snippet_select.prototype._on_template_load = function () {
+        var _this = this;
+        var app = this.dialog.template.widgetContainer.getDOMWidgetById("app");
+        var placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list");
+        var preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content");
+        var entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry");
+        placeholder_list.set_select_options(this._get_placeholders("addressbook", "addresses"));
+        // Further setup / styling that can't be done in etemplate
+        app.getInputNode().setAttribute("readonly", true);
+        this.dialog.template.DOMContainer.style.display = "flex";
+        this.dialog.template.DOMContainer.firstChild.style.display = "flex";
+        placeholder_list.getDOMNode().size = 5;
+        // Bind some handlers
+        app.onchange = function (node, widget) {
+            entry.set_value({ app: widget.get_value() });
+            placeholder_list.set_select_options(_this._get_placeholders(app.get_value(), "addresses"));
+        };
+        placeholder_list.onchange = this._on_placeholder_select.bind(this);
+        entry.onchange = this._on_placeholder_select.bind(this);
+        app.set_value(app.get_value());
+        this._on_placeholder_select();
+    };
+    /**
+     * User has selected a placeholder
+     * Update the UI, and if they have an entry selected do the replacement and show that.
+     */
+    et2_placeholder_snippet_select.prototype._on_placeholder_select = function () {
+        var app = this.dialog.template.widgetContainer.getDOMWidgetById("app");
+        var entry = this.dialog.template.widgetContainer.getDOMWidgetById("entry");
+        var placeholder_list = this.dialog.template.widgetContainer.getDOMWidgetById("placeholder_list");
+        var preview = this.dialog.template.widgetContainer.getDOMWidgetById("preview_placeholder");
+        var preview_content = this.dialog.template.widgetContainer.getDOMWidgetById("preview_content");
+        if (placeholder_list.get_value() && entry.get_value()) {
+            // Show the selected placeholder replaced with value from the selected entry
+            this.egw().json('EGroupware\\Api\\Etemplate\\Widget\\Placeholder::ajax_fill_placeholders', [placeholder_list.get_value(), { app: "addressbook", id: entry.get_value() }], function (_content) {
+                if (!_content) {
+                    _content = '';
+                }
+                this.set_value(_content);
+                preview_content.set_value(_content);
+                preview_content.getDOMNode().parentNode.style.visibility = _content.trim() ? null : 'hidden';
+            }.bind(this)).sendRequest(true);
+        }
+        else {
+            // No value, hide the row
+            preview_content.getDOMNode().parentNode.style.visibility = 'hidden';
+        }
+        if (!entry.get_value()) {
+            entry.search.get(0).focus();
+        }
+    };
+    /**
+     * Get the list of placeholder groups under the selected application
+     * @param appname
+     * @returns {value:string, label:string}[]
+     */
+    et2_placeholder_snippet_select.prototype._get_group_options = function (appname) {
+        var _this = this;
+        var options = [];
+        Object.keys(et2_placeholder_select.placeholders[appname]).map(function (key) {
+            options.push({
+                value: key,
+                label: _this.egw().lang(key)
+            });
+        });
+        return options;
+    };
+    /**
+     * Get a list of placeholders under the given application + group
+     *
+     * @param appname
+     * @param group
+     * @returns {value:string, label:string}[]
+     */
+    et2_placeholder_snippet_select.prototype._get_placeholders = function (appname, group) {
+        var _this = this;
+        var options = [];
+        Object.keys(et2_placeholder_snippet_select.placeholders[appname][group]).map(function (key) {
+            options.push({
+                value: key,
+                label: _this.egw().lang(et2_placeholder_snippet_select.placeholders[appname][group][key])
+            });
+        });
+        return options;
+    };
+    /**
+     * Get the correct insert text call the insert callback with it
+     *
+     * @param dialog_values
+     */
+    et2_placeholder_snippet_select.prototype._do_insert_callback = function (dialog_values) {
+        this.options.insert_callback(this.get_value());
+    };
+    et2_placeholder_snippet_select.prototype.set_value = function (value) {
+        this.value = value;
+    };
+    et2_placeholder_snippet_select.prototype.getValue = function () {
+        return this.value;
+    };
+    et2_placeholder_snippet_select._attributes = {
+        dialog_title: {
+            "default": "Insert address"
+        }
+    };
+    et2_placeholder_snippet_select.placeholders = {
+        "addressbook": {
+            "addresses": {
+                "{{org_name}}\n{{n_fn}}\n{{adr_one_street}}{{NELF adr_one_street2}}\n{{adr_one_formatted}}": "Business address",
+                "{{n_fn}}\n{{adr_two_street}}{{NELF adr_two_street2}}\n{{adr_two_formatted}}": "Home address",
+                "{{n_fn}}\n{{email}}\n{{tel_work}}": "Name, email, phone"
+            }
+        }
+    };
+    return et2_placeholder_snippet_select;
+}(et2_placeholder_select));
+exports.et2_placeholder_snippet_select = et2_placeholder_snippet_select;
+;
+et2_core_widget_1.et2_register_widget(et2_placeholder_snippet_select, ["placeholder-snippet"]);
+//# sourceMappingURL=et2_widget_placeholder.js.map
\ No newline at end of file