diff --git a/mail/templates/mobile/display.xet b/mail/templates/mobile/display.xet
index f377340039..adfe49583d 100644
--- a/mail/templates/mobile/display.xet
+++ b/mail/templates/mobile/display.xet
@@ -15,7 +15,7 @@
 			<hbox  class="mail-d-h1" width="100%">
 				<description align="left" id="mail_displaysubject" no_lang="1" readonly="true"/>
 			</hbox>
-			
+
 			<hbox class="mail-d-h2" id="mailDisplayHeadersFrom" disabled="!@FROM" width="100%">
 				<url-email id="FROM" readonly="true"/>
 			</hbox>
@@ -70,22 +70,22 @@
 									<description id="${row}[winmailFlag]" />
 									<description class="useEllipsis et2_link" id="${row}[filename]" expose_view="true" mime="$row_cont[type]" no_lang="1" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 									<description align="right" id="${row}[size]" />
-									<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachment"/>
-									<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
-									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
-									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
+									<buttononly id="${row}[save]" value="save" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})"/>
+									<buttononly id="${row}[saveAsVFS]" value="save" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})"/>
+									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" value="save_all" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})"/>
+									<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" value="save_zip" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 								</row>
 							</rows>
 						</grid>
 					</box>
 				</details>
 			</hbox>
-			
-			
+
+
 		</vbox>
 		<vbox class="mailDisplay">
 			<iframe frameborder="1" class="mail_displaybody" id="mailDisplayBodySrc" name="mailDisplayBodySrc" scrolling="auto" width="100%"/>
-			
+
 		</vbox>
 	</template>
 </overlay>
diff --git a/mail/templates/mobile/view.xet b/mail/templates/mobile/view.xet
index 917a008fc8..08bec13a5e 100644
--- a/mail/templates/mobile/view.xet
+++ b/mail/templates/mobile/view.xet
@@ -79,10 +79,10 @@
 								<description id="${row}[winmailFlag]" />
 								<description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
 								<description align="right" id="${row}[size]"/>
-								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachment"/>
-								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAllAttachmentsToVFS"/>
-								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAllAttachmentsToZip" label="Save as Zip"/>
+								<buttononly id="${row}[save]" image="fileexport" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})"/>
+								<buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})"/>
+								<buttononly class="$row_cont[classSaveAllPossiblyDisabled]" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
 							</row>
 						</rows>
 					</grid>