diff --git a/TODO b/TODO
index 912a5581d..3999662a4 100644
--- a/TODO
+++ b/TODO
@@ -62,4 +62,5 @@ rc6->rc7 changelog:
 - BUGFIX: Removed build dependency on Python
 - BUGFIX: Fixed a bug in children update when changing files priorities
 - BUGFIX: Pause/Start All now affect all tabs, not only the current one
+- BUGFIX: Don't reload all torrents everytime settings are saved
 - I18N: Updated Turkish translation
\ No newline at end of file
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 5436bb25f..359f91b0f 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -81,17 +81,21 @@ bittorrent::~bittorrent() {
 }
 
 void bittorrent::preAllocateAllFiles(bool b) {
-  preAllocateAll = b;
-  // Reload All Torrents
-  std::vector<torrent_handle> handles = s->get_torrents();
-  unsigned int nbHandles = handles.size();
-  for(unsigned int i=0; i<nbHandles; ++i) {
-    QTorrentHandle h = handles[i];
-    if(!h.is_valid()) {
-      qDebug("/!\\ Error: Invalid handle");
-      continue;
+  bool change = (preAllocateAll != b);
+  if(change) {
+    qDebug("PreAllocateAll changed, reloading all torrents!");
+    preAllocateAll = b;
+    // Reload All Torrents
+    std::vector<torrent_handle> handles = s->get_torrents();
+    unsigned int nbHandles = handles.size();
+    for(unsigned int i=0; i<nbHandles; ++i) {
+      QTorrentHandle h = handles[i];
+      if(!h.is_valid()) {
+        qDebug("/!\\ Error: Invalid handle");
+        continue;
+      }
+      pauseAndReloadTorrent(h, b);
     }
-    pauseAndReloadTorrent(h, b);
   }
 }
 
@@ -1226,11 +1230,13 @@ void bittorrent::reloadTorrent(const QTorrentHandle &h, bool full_alloc) {
     ++timeout;
   }
   QTorrentHandle new_h;
-  if(full_alloc)
+  if(full_alloc) {
     new_h = s->add_torrent(t, saveDir, resumeData, storage_mode_allocate);
-  else
+    qDebug("Using full allocation mode");
+  } else {
     new_h = s->add_torrent(t, saveDir, resumeData, storage_mode_sparse);
-  qDebug("Using full allocation mode");
+    qDebug("Using sparse mode");
+  }
   // Connections limit per torrent
   new_h.set_max_connections(maxConnecsPerTorrent);
   // Uploads limit per torrent