diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html
index 3845f4215f..8cb4741832 100644
--- a/skins/elastic/templates/addressbook.html
+++ b/skins/elastic/templates/addressbook.html
@@ -44,7 +44,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
 			</ul>
 		</div>
 		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" data-onclick='["command", "search"]'><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div class="scroller">
@@ -121,7 +121,7 @@ <h3 id="aria-label-groupoptions-menu" class="voice"><roundcube:label name="arial
 	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
 	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
 		<roundcube:button type="link-menuitem" label="selection" class="selection" classAct="selection active"
-			name="list-toggle-button" id="list-toggle-button" onclick="UI.toggle_list_selection(this, 'contacts-table')" />
+			name="list-toggle-button" id="list-toggle-button" onclick='["ui_toggle_list_selection", "__THIS__", "contacts-table"]' />
 		<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
 		<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert disabled" classAct="select invert active" />
 		<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none disabled" classAct="select none active" />
@@ -131,8 +131,8 @@ <h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialab
 <div id="dragcontact-menu" class="popupmenu">
 	<h3 id="aria-label-dragcontact-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
 	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragcontact-menu">
-		<roundcube:button type="link-menuitem" command="move" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
-		<roundcube:button type="link-menuitem" command="copy" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
+		<roundcube:button type="link-menuitem" command="move" data-onclick='["drag_menu_action", "move"]' label="move" class="disabled" classAct="active" />
+		<roundcube:button type="link-menuitem" command="copy" data-onclick='["drag_menu_action", "copy"]' label="copy" class="disabled" classAct="active" />
 	</ul>
 </div>
 
diff --git a/skins/elastic/templates/bounce.html b/skins/elastic/templates/bounce.html
index f9fbf02f37..425fee4828 100644
--- a/skins/elastic/templates/bounce.html
+++ b/skins/elastic/templates/bounce.html
@@ -35,7 +35,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 					<div class="input-group">
 						<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
 						<span class="input-group-append">
-							<a href="#delete" onclick="UI.header_reset('_cc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+							<a href="#delete" data-onclick='["ui_header_reset", "_cc"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 						</span>
 					</div>
 				</div>
@@ -46,7 +46,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 					<div class="input-group">
 						<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
 						<span class="input-group-append">
-							<a href="#delete" onclick="UI.header_reset('_bcc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+							<a href="#delete" data-onclick='["ui_header_reset", "_bcc"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 						</span>
 					</div>
 				</div>
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index 0f7cad8caf..47355f66c5 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -21,7 +21,7 @@ <h1 class="voice"><roundcube:label name="compose" /></h1>
 			<h2 id="aria-label-compose-attachments" class="voice"><roundcube:label name="attachments" /></h2>
 			<div class="upload-form">
 				<roundcube:object name="composeAttachmentForm" mode="hint" />
-				<button type="button" class="btn btn-secondary attach" tabindex="2" onclick="rcmail.upload_input('uploadform')"><roundcube:label name="addattachment" /></button>
+				<button type="button" class="btn btn-secondary attach" tabindex="2" data-onclick='["upload_input", "uploadform"]'><roundcube:label name="addattachment" /></button>
 			</div>
 			<roundcube:object name="composeAttachmentList" id="attachment-list" class="attachmentslist" tabindex="2" />
 			<roundcube:object name="fileDropArea" id="compose-attachments" />
@@ -78,7 +78,7 @@ <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolba
 		<div id="composestatusbar" class="position-absolute"></div>
 		<!-- toolbar -->
 		<div id="messagetoolbar" class="toolbar menu" role="toolbar" aria-labelledby="aria-label-toolbar">
-			<a class="options" href="#options" onclick="UI.show_sidebar()" data-hidden="big">
+			<a class="options" href="#options" data-onclick='["ui_show_sidebar"]' data-hidden="big">
 				<span class="inner"><roundcube:label name="optionsandattachments"></span>
 			</a>
 			<roundcube:button command="savedraft" type="link" class="save draft disabled" classAct="save draft"
@@ -86,7 +86,7 @@ <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolba
 			<span class="spacer"></span>
 			<roundcube:button name="addattachment" type="link" class="attach"
 				label="attach" title="addattachment" data-hidden="small"
-				onclick="if (!$(this).is('.disabled')) rcmail.upload_input('uploadform')"
+				data-onclick='["ui_upload_input_unless_disabled", "__THIS__"]'
 				aria-haspopup="true" aria-expanded="false" tabindex="2" innerclass="inner" />
 			<roundcube:button command="insert-sig" type="link" class="signature disabled" classAct="signature"
 				label="signature" title="insertsignature" tabindex="2" innerclass="inner" />
@@ -127,7 +127,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="from" id="_from" form="form" tabindex="1" class="form-control" />
 							<span class="input-group-append">
-								<a href="#identities" onclick="return rcmail.command('switch-task', 'settings/identities')" class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
+								<a href="#identities" data-onclick='["command", "switch-task", "settings/identities"]' class="input-group-text icon edit" title="<roundcube:label name="editidents" />" tabindex="1"><span class="inner"><roundcube:label name="editidents" /></span></a>
 							</span>
 						</div>
 					</div>
@@ -138,7 +138,7 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="to" id="_to" form="form" tabindex="1" aria-required="true" data-recipient-input="true" />
 							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('to')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
+								<a href="#add-contact" data-onclick='["ui_recipient_selector", "to"]' class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
 							</span>
 							<span class="input-group-append">
 								<a href="#add-header" data-popup="headers-menu" class="input-group-text icon add" title="<roundcube:label name="addheader" />" tabindex="1"><span class="inner"><roundcube:label name="addheader" /></span></a>
@@ -152,10 +152,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="cc" id="_cc" form="form" tabindex="1" data-recipient-input="true" />
 							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('cc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
+								<a href="#add-contact" data-onclick='["ui_recipient_selector", "cc"]' class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
 							</span>
 							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_cc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+								<a href="#delete" data-onclick='["ui_header_reset", "_cc"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 							</span>
 						</div>
 					</div>
@@ -166,10 +166,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="bcc" id="_bcc" form="form" tabindex="1" data-recipient-input="true" />
 							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('bcc')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
+								<a href="#add-contact" data-onclick='["ui_recipient_selector", "bcc"]' class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
 							</span>
 							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_bcc')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+								<a href="#delete" data-onclick='["ui_header_reset", "_bcc"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 							</span>
 						</div>
 					</div>
@@ -180,10 +180,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="replyto" id="_replyto" form="form" tabindex="1" data-recipient-input="true" />
 							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('replyto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
+								<a href="#add-contact" data-onclick='["ui_recipient_selector", "replyto"]' class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
 							</span>
 							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_replyto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+								<a href="#delete" data-onclick='["ui_header_reset", "_replyto"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 							</span>
 						</div>
 					</div>
@@ -194,10 +194,10 @@ <h2 id="aria-label-composeheaders" class="voice"><roundcube:label name="arialabe
 						<div class="input-group">
 							<roundcube:object name="composeHeaders" part="followupto" id="_followupto" form="form" tabindex="1" data-recipient-input="true" />
 							<span class="input-group-append">
-								<a href="#add-contact" onclick="UI.recipient_selector('followupto')" class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
+								<a href="#add-contact" data-onclick='["ui_recipient_selector", "followupto"]' class="input-group-text icon add recipient" title="<roundcube:label name="addcontact" />" tabindex="1"><span class="inner"><roundcube:label name="addcontact" /></span></a>
 							</span>
 							<span class="input-group-append">
-								<a href="#delete" onclick="UI.header_reset('_followupto')" class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
+								<a href="#delete" data-onclick='["ui_header_reset", "_followupto"]' class="input-group-text icon delete" title="<roundcube:label name='delete' />" tabindex="1"><span class="inner"><roundcube:label name="delete" /></span></a>
 							</span>
 						</div>
 					</div>
@@ -248,7 +248,7 @@ <h3 id="aria-label-responsesmenu" class="voice"><roundcube:label name="arialabel
 		<li role="separator" class="separator"><label><roundcube:label name="insertresponse" /></label></li>
 		<roundcube:object name="responseslist" id="responseslist" tagname="ul" class="rounded-0" itemclass="active" list-placeholder="noresponsesavailable" />
 		<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
-		<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" onclick="return rcmail.command('switch-task', 'settings/responses')" />
+		<roundcube:button name="responses" type="link-menuitem" label="editresponses" class="edit responses active" data-onclick='["command", "switch-task", "settings/responses"]' />
 	</ul>
 </div>
 
diff --git a/skins/elastic/templates/folders.html b/skins/elastic/templates/folders.html
index c3632744b2..627a8538b2 100644
--- a/skins/elastic/templates/folders.html
+++ b/skins/elastic/templates/folders.html
@@ -19,7 +19,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
 			<roundcube:object name="folderfilter" id="folderlist-filter" noheader="true" noevent="true" />
 		</div>
 		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="rcmail.folder_filter($('#folderlist-filter').val())"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" data-onclick='["filter_folder", "#folderlist-filter"]'><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div class="scroller" tabindex="-1">
diff --git a/skins/elastic/templates/includes/mail-menu.html b/skins/elastic/templates/includes/mail-menu.html
index b50d781015..7aa852910b 100644
--- a/skins/elastic/templates/includes/mail-menu.html
+++ b/skins/elastic/templates/includes/mail-menu.html
@@ -64,7 +64,7 @@ <h3 id="aria-label-message-menu" class="voice"><roundcube:label name="arialabelm
 		<roundcube:button type="link-menuitem" command="print" label="printmessage" class="print disabled" classAct="print active" data-hidden="small"/>
 		<roundcube:if condition="template:name != 'message'" />
 			<roundcube:button type="link-menuitem" command="import-messages" label="import" class="import disabled" classAct="import active"
-				name="messageimport" onclick="UI.import_dialog()" />
+				name="messageimport" data-onclick='["ui_import_dialog"]' />
 		<roundcube:endif />
 		<roundcube:button type="link-menuitem" command="download" label="export" class="download disabled" classAct="download active" />
 		<roundcube:button type="link-menuitem" command="edit" prop="new" label="editasnew" class="edit asnew disabled" classAct="edit asnew active" />
diff --git a/skins/elastic/templates/includes/menu.html b/skins/elastic/templates/includes/menu.html
index 352eeb58a8..9525d359db 100644
--- a/skins/elastic/templates/includes/menu.html
+++ b/skins/elastic/templates/includes/menu.html
@@ -34,7 +34,7 @@ <h2 id="aria-label-tasknav" class="voice"><roundcube:label name="arialabeltaskna
 				<roundcube:button name="theme" label="darkmode" type="link" innerClass="inner" class="theme dark" />
 			<roundcube:endif />
 			<roundcube:button name="about" label="about" type="link"
-				class="about" innerClass="inner" onclick="UI.about_dialog(this)" />
+				class="about" innerClass="inner" data-onclick='["ui_about_dialog", "__THIS__"]' />
 			<roundcube:button command="logout" label="logout" type="link"
 				class="logout" innerClass="inner" />
 		</span>
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index 2e483e9d6e..f521917e27 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -96,7 +96,7 @@ <h3 id="aria-label-search-menu" class="voice"><roundcube:label name="searchmod"
 			</div>
 		</div>
 		<div class="formbuttons">
-			<button type="button" class="btn btn-primary icon search" onclick="return rcmail.command('search')"><roundcube:label name="search" /></button>
+			<button type="button" class="btn btn-primary icon search" data-onclick='["command", "search"]'><roundcube:label name="search" /></button>
 		</div>
 	</div>
 	<div id="messagelist-content" class="scroller" tabindex="-1">
@@ -132,8 +132,8 @@ <h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="ariala
 <div id="dragmessage-menu" class="popupmenu">
 	<h3 id="aria-label-dragmessage-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
 	<ul class="menu listing" role="menu" aria-labelledby="aria-label-dragmessage-menu">
-		<roundcube:button command="move" type="link-menuitem" onclick="return rcmail.drag_menu_action('move')" label="move" class="disabled" classAct="active" />
-		<roundcube:button command="copy" type="link-menuitem" onclick="return rcmail.drag_menu_action('copy')" label="copy" class="disabled" classAct="active" />
+		<roundcube:button command="move" type="link-menuitem" data-onclick='["drag_menu_action", "move"]' label="move" class="disabled" classAct="active" />
+		<roundcube:button command="copy" type="link-menuitem" data-onclick='["drag_menu_action", "copy"]' label="copy" class="disabled" classAct="active" />
 	</ul>
 </div>
 
@@ -152,7 +152,7 @@ <h3 id="aria-label-mailboxoptions-menu" class="voice"><roundcube:label name="ari
 	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
 	<ul class="menu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
 		<roundcube:button type="link-menuitem" label="selection" class="selection disabled" classAct="selection active"
-			name="list-toggle-button" id="list-toggle-button" onclick="UI.toggle_list_selection(this, 'messagelist')" />
+			name="list-toggle-button" id="list-toggle-button" data-onclick='["ui_toggle_list_selection", "__THIS__", "messagelist"]' />
 		<roundcube:button command="select-all" type="link-menuitem" label="all" class="select all disabled" classAct="select all active" />
 		<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page disabled" classAct="select page active" />
 		<roundcube:button command="select-all" type="link-menuitem" prop="unread" label="unread" class="select unread disabled" classAct="select unread active" />
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index 572d59fecb..29742cd15f 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -32,8 +32,8 @@ <h2 class="subject">
 					<div class="header-links">
 						<roundcube:add_label name="details" />
 						<roundcube:add_label name="summary" />
-						<a href="#headers" class="headers-summary" onclick="return UI.headers_show(true)"></a>
-						<a href="#all-headers" class="headers-all" onclick="return UI.headers_dialog()"><roundcube:label name="headers" /></a>
+						<a href="#headers" class="headers-summary" data-onclick='["ui_headers_show", true]'></a>
+						<a href="#all-headers" class="headers-all" data-onclick='["ui_headers_dialog"]'><roundcube:label name="headers" /></a>
 						<roundcube:add_label name="arialabelmessageheaders" />
 						<roundcube:if condition="env:optional_format=='text'" />
 							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"
diff --git a/skins/elastic/templates/messagepart.html b/skins/elastic/templates/messagepart.html
index cbdd005208..882144bcf5 100644
--- a/skins/elastic/templates/messagepart.html
+++ b/skins/elastic/templates/messagepart.html
@@ -8,7 +8,7 @@ <h2 id="aria-label-toolbar" class="voice"><roundcube:label name="arialabeltoolba
 		<span class="header-title constant"><roundcube:var name="env:filename" /></span>
 		<div id="messagetoolbar" class="toolbar menu">
 			<roundcube:button type="link" name="info" label="properties" title="properties"
-				class="info" innerclass="inner" onclick="UI.props_dialog()" />
+				class="info" innerclass="inner" data-onclick='["ui_props_dialog"]' />
 			<roundcube:button command="download" type="link" label="download" title="download"
 				class="download disabled" classAct="download" innerclass="inner" />
 			<roundcube:button command="print" type="link" label="print" title="print"
@@ -70,7 +70,7 @@ <h3 id="aria-label-imagetools" class="voice"><roundcube:label name="arialabelima
 				class="rotate disabled" classAct="rotate"
 				label="rotate" title="rotateimage" innerclass="inner" />
 		</div>
-		<a href="#" class="button icon tools" onclick="$(this).attr('title', $(this).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')))"
+		<a href="#" class="button icon tools" data-onclick='["ui_image_tools_toggle_and_set_title", "__THIS__"]' 
 			data-label-show="<roundcube:label name="showtools" />" data-label-hide="<roundcube:label name="hidetools" />" title="<roundcube:label name="showtools" />">
 			<span class="inner"><roundcube:label name="showtools" /></span>
 		</a>
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 49b34ef90d..565d32869b 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -4476,3 +4476,50 @@ if ($ && $.datepicker) {
         },
     });
 }
+
+// Some helper functions to be called from event handlers.
+rcube_webmail.prototype.ui_props_dialog = function () {
+    UI.props_dialog();
+};
+
+rcube_webmail.prototype.ui_image_tools_toggle_and_set_title = function (elem) {
+    $(elem).attr('title', $(elem).data('label-' + ($('#image-tools').toggleClass('open').is('.open') ? 'hide' : 'show')));
+};
+
+rcube_webmail.prototype.ui_header_reset = function (name) {
+    UI.header_reset(name)
+};
+
+rcube_webmail.prototype.ui_show_sidebar = function () {
+    UI.show_sidebar();
+};
+
+rcube_webmail.prototype.ui_upload_input_unless_disabled = function (elem) {
+    if (!$(elem).is('.disabled')) {
+        rcmail.upload_input('uploadform');
+    }
+};
+
+rcube_webmail.prototype.ui_recipient_selector = function (name) {
+    UI.recipient_selector(name);
+};
+
+rcube_webmail.prototype.ui_toggle_list_selection = function (obj, list_id) {
+    UI.toggle_list_selection(obj, list_id);
+};
+
+rcube_webmail.prototype.ui_import_dialog = function () {
+    UI.import_dialog();
+};
+
+rcube_webmail.prototype.ui_headers_show = function (toggle) {
+    UI.headers_show(toggle);
+};
+
+rcube_webmail.prototype.ui_headers_dialog = function () {
+    UI.headers_dialog();
+};
+
+rcube_webmail.prototype.ui_about_dialog = function (elem) {
+    UI.about_dialog(elem);
+};