diff --git a/kpdf/TODO b/kpdf/TODO
index 534a9fd8b..879689de1 100644
--- a/kpdf/TODO
+++ b/kpdf/TODO
@@ -31,6 +31,8 @@ More items (first items will enter 'In progress list' first):
 -> implement history (mainly for actionNamed)
 -> history as a toolbox child (collecting DOs's setPage calls)
 -> zoom: fit text (with configurable margin)
+-> find: scroll page if the the searched string is not visible
+-> open gzipped (.pdf.gz?) files
 -> autodetect "/dev/speech" and provide {document/page/selection} -> reading
 -> automatic online dictionaries / translators (BR80338)
 -> add OCR for building TextPages out of pure graphical (aka scanned) pages
diff --git a/kpdf/kpdf_part.cpp b/kpdf/kpdf_part.cpp
index 309a55800..840a4edd2 100644
--- a/kpdf/kpdf_part.cpp
+++ b/kpdf/kpdf_part.cpp
@@ -345,11 +345,12 @@ void Part::slotFindNext()
 
 void Part::slotSaveFileAs()
 {
-	KURL saveURL = KFileDialog::getSaveURL(
-		url().isLocalFile() ? url().url() : url().fileName(),
-		QString::null, widget(), QString::null );
-	if( !KIO::NetAccess::upload( url().path(), saveURL, static_cast<QWidget*>( 0 ) ) )
-		KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( url().path() ) );
+    KURL saveURL = KFileDialog::getSaveURL( url().isLocalFile() ? url().url() : url().fileName(), QString::null, widget() );
+    if ( saveURL.isValid() && !saveURL.isEmpty() )
+    {
+        if ( !KIO::NetAccess::file_copy( url(), saveURL, -1, true ) )
+            KMessageBox::information( 0, i18n("File could not be saved in '%1'. Try to save it to another location.").arg( saveURL.prettyURL() ) );
+    }
 }
 
 void Part::slotPreferences()