diff --git a/amiga/context_menu.c b/amiga/context_menu.c
index a0a3a640f..b44275ad7 100755
--- a/amiga/context_menu.c
+++ b/amiga/context_menu.c
@@ -776,66 +776,15 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved
 
 			case CMID_SAVEOBJ:
 			case CMID_PAGESAVE:
-				object = (struct hlcache_handle *)userdata;
+				ami_file_save_req(AMINS_SAVE_SOURCE, gwin, (struct hlcache_handle *)userdata);
+			break;
 
-				if(AslRequestTags(savereq,
-							ASLFR_TitleText,messages_get("NetSurf"),
-							ASLFR_Screen,scrn,
-							ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(object))),
-							TAG_DONE))
-				{
-					BPTR fh = 0;
-					char fname[1024];
-					strlcpy(fname,savereq->fr_Drawer,1024);
-					AddPart(fname,savereq->fr_File,1024);
-					ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-
-					if(ami_download_check_overwrite(fname, gwin->win, 0))
-					{
-						if(fh = FOpen(fname,MODE_NEWFILE,0))
-						{
-							if((source_data =
-								content_get_source_data(object, &source_size)))
-									FWrite(fh, source_data, 1, source_size);
-
-							FClose(fh);
-							SetComment(fname, nsurl_access(content_get_url(object)));
-						}
-					}
-					ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-				}
+			case CMID_PAGESAVECOMPLETE:
+				ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, (struct hlcache_handle *)userdata);
 			break;
 
 			case CMID_SAVEIFFOBJ:
-				object = (struct hlcache_handle *)userdata;
-
-				if(AslRequestTags(savereq,
-							ASLFR_TitleText,messages_get("NetSurf"),
-							ASLFR_Screen,scrn,
-							ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(object))),
-							TAG_DONE))
-				{
-					BPTR fh = 0;
-					char fname[1024];
-
-					strlcpy(fname,savereq->fr_Drawer,1024);
-					AddPart(fname,savereq->fr_File,1024);
-					if((bm = content_get_bitmap(object)))
-					{
-						bm->url = (char *)nsurl_access(content_get_url(object));
-						bm->title = (char *)content_get_title(object);
-						if(bitmap_save(bm, fname, 0))
-							SetComment(fname, nsurl_access(content_get_url(object)));
-					}
-#ifdef WITH_NS_SVG
-					else if(ami_mime_compare(object, "svg") == true)
-					{
-						if(ami_save_svg(object,fname))
-							SetComment(fname, nsurl_access(content_get_url(object)));
-					}
-#endif
-					ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-				}
+				ami_file_save_req(AMINS_SAVE_IFF, gwin, (struct hlcache_handle *)userdata);
 			break;
 
 			case CMID_PLUGINCMD:
diff --git a/amiga/gui.c b/amiga/gui.c
index bdf7b76aa..0edf59050 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -1425,6 +1425,10 @@ void ami_handle_msg(void)
 								ami_file_open(gwin);
 							break;
 
+							case 's':
+								ami_file_save_source(gwin, gwin->bw->current_content);
+							break;
+
 							case 'p':
 								ami_print_ui(gwin->bw->current_content);
 							break;
diff --git a/amiga/menu.c b/amiga/menu.c
index e4d303e95..13cbf9e78 100755
--- a/amiga/menu.c
+++ b/amiga/menu.c
@@ -42,7 +42,6 @@
 #include "amiga/bitmap.h"
 #include "amiga/clipboard.h"
 #include "amiga/cookies.h"
-#include "amiga/download.h"
 #include "amiga/file.h"
 #include "amiga/filetype.h"
 #include "amiga/gui.h"
@@ -50,28 +49,20 @@
 #include "amiga/history.h"
 #include "amiga/history_local.h"
 #include "amiga/hotlist.h"
-#include "amiga/icon.h"
-#include "amiga/iff_dr2d.h"
 #include "amiga/menu.h"
 #include "amiga/options.h"
 #include "amiga/print.h"
-#include "amiga/save_pdf.h"
 #include "amiga/search.h"
 #include "amiga/theme.h"
 #include "amiga/tree.h"
 #include "amiga/utf8.h"
-#include "content/fetch.h"
 #include "desktop/tree_url_node.h"
 #include "desktop/hotlist.h"
 #include "desktop/browser.h"
 #include "desktop/gui.h"
-#include "desktop/save_text.h"
-#include "desktop/save_pdf/pdf_plotters.h"
-#include "desktop/save_complete.h"
 #include "desktop/selection.h"
 #include "desktop/textinput.h"
 #include "utils/messages.h"
-#include "utils/url.h"
 
 #define IMAGE_MENU_ITEM(n, i, t) \
 	gwin->menulab[n] = LabelObject, \
@@ -92,7 +83,6 @@ ULONG ami_menu_scan(struct tree *tree, bool count, struct gui_window_2 *gwin);
 void ami_menu_scan_2(struct tree *tree, struct node *root, WORD *gen,
 		ULONG *item, bool count, struct gui_window_2 *gwin);
 void ami_menu_arexx_scan(struct gui_window_2 *gwin);
-static const ULONG ami_asl_mime_hook(struct Hook *mh,struct FileRequester *fr,struct AnchorPathOld *ap);
 
 
 void ami_free_menulabs(struct gui_window_2 *gwin)
@@ -460,11 +450,8 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
 	itemnum = ITEMNUM(code);
 	subnum = SUBNUM(code);
 	char *temp, *temp2;
-	BPTR lock = 0;
-	const char *source_data;
-	ULONG source_size;
-	struct bitmap *bm;
 	int sel = 0;
+	struct bitmap *bm = NULL;
 
 	switch(menunum)
 	{
@@ -486,128 +473,24 @@ void ami_menupick(ULONG code,struct gui_window_2 *gwin,struct MenuItem *item)
 				case 4: // save
 					switch(subnum)
 					{
-						BPTR fh=0;
-						char fname[1024];
-
 						case 0:
-							if(AslRequestTags(savereq,
-								ASLFR_TitleText,messages_get("NetSurf"),
-								ASLFR_Screen,scrn,
-								ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))),
-								TAG_DONE))
-							{
-								strlcpy(fname,savereq->fr_Drawer,1024);
-								AddPart(fname,savereq->fr_File,1024);
-								ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-
-								if(ami_download_check_overwrite(fname, gwin->win, 0))
-								{
-									if(fh = FOpen(fname,MODE_NEWFILE,0))
-									{
-										if((source_data =
-											content_get_source_data(gwin->bw->current_content, &source_size)))
-												FWrite(fh,source_data, 1, source_size);
-										FClose(fh);
-										SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content)));
-									}
-								}
-								ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-							}
+							ami_file_save_req(AMINS_SAVE_SOURCE, gwin, gwin->bw->current_content);
 						break;
 
 						case 1:
-							if(AslRequestTags(savereq,
-								ASLFR_TitleText,messages_get("NetSurf"),
-								ASLFR_Screen,scrn,
-								ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))),
-								TAG_DONE))
-							{
-								strlcpy(fname,savereq->fr_Drawer,1024);
-								AddPart(fname,savereq->fr_File,1024);
-								ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-
-								if(ami_download_check_overwrite(fname, gwin->win, 0))
-								{
-									save_as_text(gwin->bw->current_content,fname);
-									SetComment(fname,nsurl_access(content_get_url(gwin->bw->current_content)));
-								}
-								ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-							}
+							ami_file_save_req(AMINS_SAVE_TEXT, gwin, gwin->bw->current_content);
 						break;
 
 						case 2:
-							if(AslRequestTags(savereq,
-								ASLFR_TitleText,messages_get("NetSurf"),
-								ASLFR_Screen,scrn,
-								ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))),
-								TAG_DONE))
-							{
-								strlcpy(fname,savereq->fr_Drawer,1024);
-								AddPart(fname,savereq->fr_File,1024);
-								ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-								if(ami_download_check_overwrite(fname, gwin->win, 0))
-								{
-									if(lock = CreateDir(fname))
-									{
-										UnLock(lock);
-										save_complete(gwin->bw->current_content,fname);
-										SetComment(fname,nsurl_access(content_get_url(gwin->bw->current_content)));
-										amiga_icon_superimpose_favicon(fname, 
-											gwin->bw->window->favicon, NULL);
-									}
-								}
-								ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-							}
+							ami_file_save_req(AMINS_SAVE_COMPLETE, gwin, gwin->bw->current_content);
 						break;
 
 						case 3:
-#ifdef WITH_PDF_EXPORT
-							if(AslRequestTags(savereq,
-								ASLFR_TitleText,messages_get("NetSurf"),
-								ASLFR_Screen,scrn,
-								ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))),
-								TAG_DONE))
-							{
-								strlcpy(&fname,savereq->fr_Drawer,1024);
-								AddPart(fname,savereq->fr_File,1024);
-								ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-								if(save_as_pdf(gwin->bw->current_content,fname))
-								{
-									SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content)));
-									amiga_icon_superimpose_favicon(fname,
-										gwin->bw->window->favicon, "pdf");
-								}
-								ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-							}
-#endif
+							ami_file_save_req(AMINS_SAVE_PDF, gwin, gwin->bw->current_content);
 						break;
 
 						case 4: // iff
-							if(AslRequestTags(savereq,
-								ASLFR_TitleText,messages_get("NetSurf"),
-								ASLFR_Screen,scrn,
-								ASLFR_InitialFile,FilePart(nsurl_access(content_get_url(gwin->bw->current_content))),
-								TAG_DONE))
-							{
-								strlcpy(fname,savereq->fr_Drawer,1024);
-								AddPart(fname,savereq->fr_File,1024);
-								ami_update_pointer(gwin->win,GUI_POINTER_WAIT);
-								if((bm = content_get_bitmap(gwin->bw->current_content)))
-								{
-									bm->url = (char *)nsurl_access(content_get_url(gwin->bw->current_content));
-									bm->title = (char *)content_get_title(gwin->bw->current_content);
-									if(bitmap_save(bm, fname, 0))
-										SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content)));
-								}
-#ifdef WITH_NS_SVG
-								else if(ami_mime_compare(gwin->bw->current_content, "svg") == true)
-								{
-									if(ami_save_svg(gwin->bw->current_content,fname))
-										SetComment(fname, nsurl_access(content_get_url(gwin->bw->current_content)));
-								}
-#endif
-								ami_update_pointer(gwin->win,GUI_POINTER_DEFAULT);
-							}
+							ami_file_save_req(AMINS_SAVE_IFF, gwin, gwin->bw->current_content);
 						break;
 					}
 				break;