diff --git a/Changelog b/Changelog
index 23dbd5bb2..63db43b6d 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+* Unknown - Christophe Dumez <chris@qbittorrent.org> - v1.4.1
+    - BUGFIX: Fix problems when changing save path (if using temporary download folder)
+
 * Thu Aug 13 2009 - Christophe Dumez <chris@qbittorrent.org> - v1.4.0
     - FEATURE: Display swarm information in lists
     - FEATURE: Allow to define temporary download folder
diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop
index f81accdfc..1fd984c26 100644
--- a/src/Icons/qBittorrent.desktop
+++ b/src/Icons/qBittorrent.desktop
@@ -1,6 +1,6 @@
 [Desktop Entry]
 Categories=Qt;Network;P2P
-Comment=V1.4.0
+Comment=V1.4.1
 Exec=qbittorrent %f
 GenericName=Bittorrent client
 GenericName[bg]=Торент клиент
diff --git a/src/Icons/skin/splash.png b/src/Icons/skin/splash.png
index 10322b520..18dc3bdca 100644
Binary files a/src/Icons/skin/splash.png and b/src/Icons/skin/splash.png differ
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index fed917041..c539c7b7f 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -151,6 +151,10 @@ void bittorrent::setDownloadLimit(QString hash, long val) {
   saveTorrentSpeedLimits(hash);
 }
 
+bool bittorrent::useTemporaryFolder() const {
+  return !defaultTempPath.isEmpty();
+}
+
 bool bittorrent::isQueueingEnabled() const {
   return queueingEnabled;
 }
diff --git a/src/bittorrent.h b/src/bittorrent.h
index 2755affbe..7d887efe2 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -107,6 +107,7 @@ class bittorrent : public QObject {
     QStringList getConsoleMessages() const;
     QStringList getPeerBanMessages() const;
     qlonglong getETA(QString hash) const;
+    bool useTemporaryFolder() const;
 
   public slots:
     QTorrentHandle addTorrent(QString path, bool fromScanDir = false, QString from_url = QString(), bool resumed = false);
diff --git a/src/properties_imp.cpp b/src/properties_imp.cpp
index 2d3355c6d..cb35c2d5a 100644
--- a/src/properties_imp.cpp
+++ b/src/properties_imp.cpp
@@ -711,7 +711,8 @@ void properties::on_changeSavePathButton_clicked() {
         savepath_file.write(savePath.path().toLocal8Bit());
         savepath_file.close();
         // Actually move storage
-        h.move_storage(savePath.path());
+        if(!BTSession->useTemporaryFolder() || h.is_seed())
+	        h.move_storage(savePath.path());
         // Update save_path in dialog
         save_path->setText(savePath.path());
     }
diff --git a/src/src.pro b/src/src.pro
index 7dcf580e9..6927f88e7 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -14,10 +14,10 @@ CONFIG += qt \
     network
 
 # Update this VERSION for each release
-DEFINES += VERSION=\\\"v1.4.0\\\"
+DEFINES += VERSION=\\\"v1.4.1\\\"
 DEFINES += VERSION_MAJOR=1
 DEFINES += VERSION_MINOR=4
-DEFINES += VERSION_BUGFIX=0
+DEFINES += VERSION_BUGFIX=1
 !mac:QMAKE_LFLAGS += -Wl,--as-needed
 contains(DEBUG_MODE, 1) { 
     CONFIG += debug