diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp
index 7f64dcddf..598322177 100644
--- a/src/torrentadditiondlg.cpp
+++ b/src/torrentadditiondlg.cpp
@@ -61,646 +61,641 @@ torrentAdditionDialog::torrentAdditionDialog(GUI *parent, Bittorrent* _BTSession
   display_path = display_path.replace("/", "\\");
 #endif
   savePathTxt->addItem(display_path);
-  // Load save path history
-  QStringList raw_path_history = getSavePathHistory();
-  foreach(const QString &sp, raw_path_history) {
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    if(sp.compare(display_path, Qt::CaseInsensitive) != 0) {
-#else
-      if(sp.compare(display_path, Qt::CaseSensitive) != 0) {
-#endif
-        path_history << sp;
-        QString dsp = sp;
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-        dsp = dsp.replace("/", "\\");
-#endif
-        savePathTxt->addItem(dsp);
-      }
-    }
 
-    if(Preferences::addTorrentsInPause()) {
-      addInPause->setChecked(true);
-      //addInPause->setEnabled(false);
-    }
+  if(Preferences::addTorrentsInPause()) {
+    addInPause->setChecked(true);
+    //addInPause->setEnabled(false);
+  }
+  // Load custom labels
+  QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  settings.beginGroup(QString::fromUtf8("TransferListFilters"));
+  const QStringList &customLabels = settings.value("customLabels", QStringList()).toStringList();
+  comboLabel->addItem("");
+  foreach(const QString& label, customLabels) {
+    comboLabel->addItem(label);
+  }
+
 #if LIBTORRENT_VERSION_MINOR < 15
-    addInSeed->setVisible(false);
+  addInSeed->setVisible(false);
 #endif
-    // Set Add button as default
-    OkButton->setDefault(true);
-  }
+  // Set Add button as default
+  OkButton->setDefault(true);
+}
 
-  torrentAdditionDialog::~torrentAdditionDialog() {
-    saveSettings();
-    delete PropDelegate;
-    delete PropListModel;
-  }
+torrentAdditionDialog::~torrentAdditionDialog() {
+  saveSettings();
+  delete PropDelegate;
+  delete PropListModel;
+}
 
-  void torrentAdditionDialog::readSettings() {
-    QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    // Restore size and position
-    resize(settings.value(QString::fromUtf8("TorrentAdditionDlg/size"), size()).toSize());
-    move(settings.value(QString::fromUtf8("TorrentAdditionDlg/pos"), misc::screenCenter(this)).toPoint());
-    // Restore column width
-    const QList<int> &contentColsWidths = misc::intListfromStringList(settings.value(QString::fromUtf8("TorrentAdditionDlg/filesColsWidth")).toStringList());
-    if(contentColsWidths.empty()) {
-      torrentContentList->header()->resizeSection(0, 200);
-    } else {
-      for(int i=0; i<contentColsWidths.size(); ++i) {
-        torrentContentList->setColumnWidth(i, contentColsWidths.at(i));
-      }
+void torrentAdditionDialog::readSettings() {
+  QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  // Restore size and position
+  resize(settings.value(QString::fromUtf8("TorrentAdditionDlg/size"), size()).toSize());
+  move(settings.value(QString::fromUtf8("TorrentAdditionDlg/pos"), misc::screenCenter(this)).toPoint());
+  // Restore column width
+  const QList<int> &contentColsWidths = misc::intListfromStringList(settings.value(QString::fromUtf8("TorrentAdditionDlg/filesColsWidth")).toStringList());
+  if(contentColsWidths.empty()) {
+    torrentContentList->header()->resizeSection(0, 200);
+  } else {
+    for(int i=0; i<contentColsWidths.size(); ++i) {
+      torrentContentList->setColumnWidth(i, contentColsWidths.at(i));
     }
   }
+}
 
-  void torrentAdditionDialog::saveSettings() {
-    QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    if(!is_magnet && t.get() && t->is_valid() && t->num_files() > 1) {
-      QStringList contentColsWidths;
-      // -1 because we hid PROGRESS column
-      for(int i=0; i<PropListModel->columnCount()-1; ++i) {
-        contentColsWidths << QString::number(torrentContentList->columnWidth(i));
-      }
-      settings.setValue(QString::fromUtf8("TorrentAdditionDlg/filesColsWidth"), contentColsWidths);
+void torrentAdditionDialog::saveSettings() {
+  QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+  if(!is_magnet && t.get() && t->is_valid() && t->num_files() > 1) {
+    QStringList contentColsWidths;
+    // -1 because we hid PROGRESS column
+    for(int i=0; i<PropListModel->columnCount()-1; ++i) {
+      contentColsWidths << QString::number(torrentContentList->columnWidth(i));
     }
-    settings.setValue("TorrentAdditionDlg/size", size()+QSize(0, hidden_height));
-    qDebug("pos: (%d, %d)", pos().x(), pos().y());
-    settings.setValue("TorrentAdditionDlg/pos", pos());
+    settings.setValue(QString::fromUtf8("TorrentAdditionDlg/filesColsWidth"), contentColsWidths);
+  }
+  settings.setValue("TorrentAdditionDlg/size", size()+QSize(0, hidden_height));
+  qDebug("pos: (%d, %d)", pos().x(), pos().y());
+  settings.setValue("TorrentAdditionDlg/pos", pos());
+}
+
+void torrentAdditionDialog::renameTorrentNameInModel(QString file_path) {
+  file_path = file_path.replace("\\", "/");
+  // Rename in torrent files model too
+  PropListModel->setData(PropListModel->index(0, 0), file_path.split("/", QString::SkipEmptyParts).last());
+}
+
+void torrentAdditionDialog::hideTorrentContent() {
+  // Disable useless widgets
+  hidden_height += torrentContentList->height();
+  torrentContentList->setVisible(false);
+  hidden_height += torrentContentLbl->height();
+  torrentContentLbl->setVisible(false);
+  hidden_height += selectAllButton->height();
+  selectNoneButton->setVisible(false);
+  selectAllButton->setVisible(false);
+
+  // Resize main window
+  setMinimumSize(0, 0);
+  resize(width(), height()-hidden_height);
+}
+
+void torrentAdditionDialog::showLoadMagnetURI(QString magnet_uri) {
+  show();
+  is_magnet = true;
+  this->from_url = magnet_uri;
+
+  // Disable Save path combox and browse button
+  // Save path should be default for magnet links
+  savePathTxt->setEnabled(false);
+  browseButton->setEnabled(false);
+
+  // Get torrent hash
+  hash = misc::magnetUriToHash(magnet_uri);
+  if(hash.isEmpty()) {
+    BTSession->addConsoleMessage(tr("Unable to decode magnet link:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
+    return;
+  }
+  // Set torrent name
+  fileName = misc::magnetUriToName(magnet_uri);
+  if(fileName.isEmpty()) {
+    fileName = tr("Magnet Link");
+  }
+  fileNameLbl->setText(QString::fromUtf8("<center><b>")+fileName+QString::fromUtf8("</b></center>"));
+  // Update display
+  updateDiskSpaceLabels();
+
+  // No need to display torrent content
+  hideTorrentContent();
+}
+
+void torrentAdditionDialog::showLoad(QString filePath, QString from_url) {
+  is_magnet = false;
+  if(!QFile::exists(filePath)) {
+    close();
+    return;
   }
 
-  void torrentAdditionDialog::renameTorrentNameInModel(QString file_path) {
-    file_path = file_path.replace("\\", "/");
-    // Rename in torrent files model too
-    PropListModel->setData(PropListModel->index(0, 0), file_path.split("/", QString::SkipEmptyParts).last());
-  }
-
-  void torrentAdditionDialog::hideTorrentContent() {
-    // Disable useless widgets
-    hidden_height += torrentContentList->height();
-    torrentContentList->setVisible(false);
-    hidden_height += torrentContentLbl->height();
-    torrentContentLbl->setVisible(false);
-    hidden_height += selectAllButton->height();
-    selectNoneButton->setVisible(false);
-    selectAllButton->setVisible(false);
-
-    // Resize main window
-    setMinimumSize(0, 0);
-    resize(width(), height()-hidden_height);
-  }
-
-  void torrentAdditionDialog::showLoadMagnetURI(QString magnet_uri) {
-    show();
-    is_magnet = true;
-    this->from_url = magnet_uri;
-
-    // Get torrent hash
-    hash = misc::magnetUriToHash(magnet_uri);
-    if(hash.isEmpty()) {
-      BTSession->addConsoleMessage(tr("Unable to decode magnet link:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
-      return;
-    }
-    fileName = misc::magnetUriToName(magnet_uri);
-    if(fileName.isEmpty()) {
-      fileName = tr("Magnet Link");
-    } else {
-      QString save_path = savePathTxt->currentText();
-      if(!save_path.endsWith(QDir::separator()))
-        save_path += QDir::separator();
-      savePathTxt->setEditText(save_path + fileName);
-    }
-    fileNameLbl->setText(QString::fromUtf8("<center><b>")+fileName+QString::fromUtf8("</b></center>"));
-    connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateSavePathCurrentText(QString)));
-    // Update display
-    updateDiskSpaceLabels();
-    // Load custom labels
-    QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    settings.beginGroup(QString::fromUtf8("TransferListFilters"));
-    QStringList customLabels = settings.value("customLabels", QStringList()).toStringList();
-    comboLabel->addItem("");
-    foreach(const QString& label, customLabels) {
-      comboLabel->addItem(label);
-    }
-    // No need to display torrent content
-    hideTorrentContent();
-  }
-
-  void torrentAdditionDialog::showLoad(QString filePath, QString from_url) {
-    is_magnet = false;
-    if(!QFile::exists(filePath)) {
-      close();
-      return;
-    }
-    this->filePath = filePath;
-    this->from_url = from_url;
-    // Getting torrent file informations
-    try {
-      t = new torrent_info(filePath.toUtf8().data());
-      if(!t->is_valid())
-        throw std::exception();
-    } catch(std::exception&) {
-      qDebug("Caught error loading torrent");
-      if(!from_url.isNull()){
-        BTSession->addConsoleMessage(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
-        QFile::remove(filePath);
-      }else{
-        BTSession->addConsoleMessage(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+filePath+QString::fromUtf8("'"), QString::fromUtf8("red"));
-      }
-      close();
-      return;
-    }
-    nbFiles = t->num_files();
-    if(nbFiles == 0) {
-      // Empty torrent file!?
-      close();
-      return;
-    }
-    if(nbFiles == 1) {
-      // Update properties model whenever the file path is edited
-      connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(renameTorrentNameInModel(QString)));
-    }
-    QString root_folder = misc::truncateRootFolder(t);
-    QString save_path = savePathTxt->currentText();
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-    save_path = save_path.replace("/", "\\");
-#endif
-    if(!save_path.endsWith(QDir::separator()))
-      save_path += QDir::separator();
-    // If the torrent has a root folder, append it to the save path
-    if(!root_folder.isEmpty()) {
-      savePathTxt->setEditText(save_path + root_folder);
-      // Update other combo items
-      for(int i=0; i<savePathTxt->count(); ++i) {
-        savePathTxt->setItemText(i, savePathTxt->itemText(i) + root_folder);
-      }
-    }
-    if(nbFiles == 1) {
-      // single file torrent
-      QString single_file_relpath = misc::toQStringU(t->file_at(0).path.string());
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-      single_file_relpath = single_file_relpath.replace("/", "\\");
-#endif
-      savePathTxt->setEditText(save_path + single_file_relpath);
-      // Update other combo items
-      for(int i=0; i<savePathTxt->count(); ++i) {
-        savePathTxt->setItemText(i, savePathTxt->itemText(i) + single_file_relpath);
-      }
-    }
-    // Setting file name
-    fileName = misc::toQStringU(t->name());
-    hash = misc::toQString(t->info_hash());
-    // Use left() to remove .old extension
-    QString newFileName;
-    if(fileName.endsWith(QString::fromUtf8(".old"))){
-      newFileName = fileName.left(fileName.size()-4);
+  this->filePath = filePath;
+  this->from_url = from_url;
+  // Getting torrent file informations
+  try {
+    t = new torrent_info(filePath.toUtf8().data());
+    if(!t->is_valid())
+      throw std::exception();
+  } catch(std::exception&) {
+    qDebug("Caught error loading torrent");
+    if(!from_url.isNull()){
+      BTSession->addConsoleMessage(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+from_url+QString::fromUtf8("'"), QString::fromUtf8("red"));
+      QFile::remove(filePath);
     }else{
-      newFileName = fileName;
+      BTSession->addConsoleMessage(tr("Unable to decode torrent file:")+QString::fromUtf8(" '")+filePath+QString::fromUtf8("'"), QString::fromUtf8("red"));
     }
-    fileNameLbl->setText(QString::fromUtf8("<center><b>")+newFileName+QString::fromUtf8("</b></center>"));
-    if(t->num_files() > 1) {
-      // List files in torrent
-      PropListModel->setupModelData(*t);
-      // Expand first item if possible
-      torrentContentList->expand(PropListModel->index(0, 0));
-      connect(PropDelegate, SIGNAL(filteredFilesChanged()), this, SLOT(updateDiskSpaceLabels()));
-      // Loads files path in the torrent
-      for(uint i=0; i<nbFiles; ++i) {
-        files_path << misc::toQStringU(t->file_at(i).path.string());
-      }
+    close();
+    return;
+  }
+  nbFiles = t->num_files();
+  if(nbFiles == 0) {
+    // Empty torrent file!?
+    close();
+    return;
+  }
+  // Truncate root folder
+  QString root_folder = misc::truncateRootFolder(t);
+  // Setting file name
+  fileName = misc::toQStringU(t->name());
+  hash = misc::toQString(t->info_hash());
+  // Use left() to remove .old extension
+  QString newFileName;
+  if(fileName.endsWith(QString::fromUtf8(".old"))){
+    newFileName = fileName.left(fileName.size()-4);
+  }else{
+    newFileName = fileName;
+  }
+  fileNameLbl->setText(QString::fromUtf8("<center><b>")+newFileName+QString::fromUtf8("</b></center>"));
+  if(t->num_files() > 1) {
+    // List files in torrent
+    PropListModel->setupModelData(*t);
+    connect(PropDelegate, SIGNAL(filteredFilesChanged()), this, SLOT(updateDiskSpaceLabels()));
+    // Loads files path in the torrent
+    for(uint i=0; i<nbFiles; ++i) {
+      files_path << misc::toQStringU(t->file_at(i).path.string());
     }
-    connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateDiskSpaceLabels()));
-    connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateSavePathCurrentText(QString)));
-    updateDiskSpaceLabels();
-    // Load custom labels
-    QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-    settings.beginGroup(QString::fromUtf8("TransferListFilters"));
-    const QStringList &customLabels = settings.value("customLabels", QStringList()).toStringList();
-    comboLabel->addItem("");
-    foreach(const QString& label, customLabels) {
-      comboLabel->addItem(label);
-    }
-    // Show the dialog
-    show();
-    if(t->num_files() <= 1)
-      hideTorrentContent();
   }
 
-  void torrentAdditionDialog::displayContentListMenu(const QPoint&) {
-    QMenu myFilesLlistMenu;
-    const QModelIndexList &selectedRows = torrentContentList->selectionModel()->selectedRows(0);
-    QAction *actRename = 0;
-    if(selectedRows.size() == 1 && t->num_files() > 1) {
-      actRename = myFilesLlistMenu.addAction(QIcon(QString::fromUtf8(":/Icons/oxygen/edit_clear.png")), tr("Rename..."));
-      myFilesLlistMenu.addSeparator();
-    }
-    QMenu subMenu;
-    subMenu.setTitle(tr("Priority"));
-    subMenu.addAction(actionNot_downloaded);
-    subMenu.addAction(actionNormal);
-    subMenu.addAction(actionHigh);
-    subMenu.addAction(actionMaximum);
-    myFilesLlistMenu.addMenu(&subMenu);
-    // Call menu
-    QAction *act = myFilesLlistMenu.exec(QCursor::pos());
-    if(act) {
-      if(act == actRename) {
-        renameSelectedFile();
+  // Load save path history
+  loadSavePathHistory();
+
+  // Connect slots
+  connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateDiskSpaceLabels()));
+  connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateSavePathCurrentText(QString)));
+  if(nbFiles == 1) {
+    // Update properties model whenever the file path is edited
+    connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(renameTorrentNameInModel(QString)));
+  }
+
+  QString save_path = savePathTxt->currentText();
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+  save_path = save_path.replace("/", "\\");
+#endif
+  if(!save_path.endsWith(QDir::separator()))
+    save_path += QDir::separator();
+  // If the torrent has a root folder, append it to the save path
+  if(!root_folder.isEmpty()) {
+    save_path += root_folder;
+  }
+  if(nbFiles == 1) {
+    // single file torrent
+    QString single_file_relpath = misc::toQStringU(t->file_at(0).path.string());
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+    single_file_relpath = single_file_relpath.replace("/", "\\");
+#endif
+    save_path += single_file_relpath;
+  }
+  savePathTxt->setEditText(save_path);
+
+  // Show the dialog
+  show();
+
+  // Hide useless widgets
+  if(t->num_files() <= 1)
+    hideTorrentContent();
+}
+
+void torrentAdditionDialog::displayContentListMenu(const QPoint&) {
+  Q_ASSERT(!is_magnet && t->num_files() > 1);
+  QMenu myFilesLlistMenu;
+  const QModelIndexList &selectedRows = torrentContentList->selectionModel()->selectedRows(0);
+  QAction *actRename = 0;
+  if(selectedRows.size() == 1 && t->num_files() > 1) {
+    actRename = myFilesLlistMenu.addAction(QIcon(QString::fromUtf8(":/Icons/oxygen/edit_clear.png")), tr("Rename..."));
+    myFilesLlistMenu.addSeparator();
+  }
+  QMenu subMenu;
+  subMenu.setTitle(tr("Priority"));
+  subMenu.addAction(actionNot_downloaded);
+  subMenu.addAction(actionNormal);
+  subMenu.addAction(actionHigh);
+  subMenu.addAction(actionMaximum);
+  myFilesLlistMenu.addMenu(&subMenu);
+  // Call menu
+  QAction *act = myFilesLlistMenu.exec(QCursor::pos());
+  if(act) {
+    if(act == actRename) {
+      renameSelectedFile();
+    } else {
+      int prio = 1;
+      if(act == actionHigh) {
+        prio = HIGH;
       } else {
-        int prio = 1;
-        if(act == actionHigh) {
-          prio = HIGH;
+        if(act == actionMaximum) {
+          prio = MAXIMUM;
         } else {
-          if(act == actionMaximum) {
-            prio = MAXIMUM;
-          } else {
-            if(act == actionNot_downloaded) {
-              prio = IGNORED;
-            }
+          if(act == actionNot_downloaded) {
+            prio = IGNORED;
           }
         }
-        qDebug("Setting files priority");
-        foreach(const QModelIndex &index, selectedRows) {
-          qDebug("Setting priority(%d) for file at row %d", prio, index.row());
-          PropListModel->setData(PropListModel->index(index.row(), PRIORITY, index.parent()), prio);
-        }
+      }
+      qDebug("Setting files priority");
+      foreach(const QModelIndex &index, selectedRows) {
+        qDebug("Setting priority(%d) for file at row %d", prio, index.row());
+        PropListModel->setData(PropListModel->index(index.row(), PRIORITY, index.parent()), prio);
       }
     }
   }
+}
 
-  void torrentAdditionDialog::renameSelectedFile() {
-    const QModelIndexList &selectedIndexes = torrentContentList->selectionModel()->selectedRows(0);
-    Q_ASSERT(selectedIndexes.size() == 1);
-    const QModelIndex &index = selectedIndexes.first();
-    // Ask for new name
-    bool ok;
-    const QString &new_name_last = QInputDialog::getText(this, tr("Rename the file"),
-                                                         tr("New name:"), QLineEdit::Normal,
-                                                         index.data().toString(), &ok);
-    if (ok && !new_name_last.isEmpty()) {
-      if(!misc::isValidFileSystemName(new_name_last)) {
-        QMessageBox::warning(this, tr("The file could not be renamed"),
-                             tr("This file name contains forbidden characters, please choose a different one."),
-                             QMessageBox::Ok);
+void torrentAdditionDialog::renameSelectedFile() {
+  Q_ASSERT(!is_magnet && t->num_files() > 1);
+  const QModelIndexList &selectedIndexes = torrentContentList->selectionModel()->selectedRows(0);
+  Q_ASSERT(selectedIndexes.size() == 1);
+  const QModelIndex &index = selectedIndexes.first();
+  // Ask for new name
+  bool ok;
+  const QString &new_name_last = QInputDialog::getText(this, tr("Rename the file"),
+                                                       tr("New name:"), QLineEdit::Normal,
+                                                       index.data().toString(), &ok);
+  if (ok && !new_name_last.isEmpty()) {
+    if(!misc::isValidFileSystemName(new_name_last)) {
+      QMessageBox::warning(this, tr("The file could not be renamed"),
+                           tr("This file name contains forbidden characters, please choose a different one."),
+                           QMessageBox::Ok);
+      return;
+    }
+    if(PropListModel->getType(index)==TFILE) {
+      // File renaming
+      const uint file_index = PropListModel->getFileIndex(index);
+      QString old_name = files_path.at(file_index);
+      old_name = old_name.replace("\\", "/");
+      qDebug("Old name: %s", qPrintable(old_name));
+      QStringList path_items = old_name.split("/");
+      path_items.removeLast();
+      path_items << new_name_last;
+      QString new_name = path_items.join("/");
+      if(old_name == new_name) {
+        qDebug("Name did not change");
         return;
       }
-      if(PropListModel->getType(index)==TFILE) {
-        // File renaming
-        const uint file_index = PropListModel->getFileIndex(index);
-        QString old_name = files_path.at(file_index);
-        old_name = old_name.replace("\\", "/");
-        qDebug("Old name: %s", qPrintable(old_name));
-        QStringList path_items = old_name.split("/");
-        path_items.removeLast();
-        path_items << new_name_last;
-        QString new_name = path_items.join("/");
-        if(old_name == new_name) {
-          qDebug("Name did not change");
-          return;
+      new_name = QDir::cleanPath(new_name);
+      qDebug("New name: %s", qPrintable(new_name));
+      // Check if that name is already used
+      for(uint i=0; i<nbFiles; ++i) {
+        if(i == file_index) continue;
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+        if(files_path.at(i).compare(new_name, Qt::CaseSensitive) == 0) {
+#else
+          if(files_path.at(i).compare(new_name, Qt::CaseInsensitive) == 0) {
+#endif
+            // Display error message
+            QMessageBox::warning(this, tr("The file could not be renamed"),
+                                 tr("This name is already in use in this folder. Please use a different name."),
+                                 QMessageBox::Ok);
+            return;
+          }
         }
         new_name = QDir::cleanPath(new_name);
-        qDebug("New name: %s", qPrintable(new_name));
-        // Check if that name is already used
+        qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name));
+        // Rename file in files_path
+        files_path.replace(file_index, new_name);
+        // Rename in torrent files model too
+        PropListModel->setData(index, new_name_last);
+      } else {
+        // Folder renaming
+        QStringList path_items;
+        path_items << index.data().toString();
+        QModelIndex parent = PropListModel->parent(index);
+        while(parent.isValid()) {
+          path_items.prepend(parent.data().toString());
+          parent = PropListModel->parent(parent);
+        }
+        const QString &old_path = path_items.join("/");
+        path_items.removeLast();
+        path_items << new_name_last;
+        QString new_path = path_items.join("/");
+        if(!new_path.endsWith("/")) new_path += "/";
+        // Check for overwriting
         for(uint i=0; i<nbFiles; ++i) {
-          if(i == file_index) continue;
+          const QString &current_name = files_path.at(i);
 #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-          if(files_path.at(i).compare(new_name, Qt::CaseSensitive) == 0) {
+          if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
 #else
-            if(files_path.at(i).compare(new_name, Qt::CaseInsensitive) == 0) {
+            if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
 #endif
-              // Display error message
-              QMessageBox::warning(this, tr("The file could not be renamed"),
+              QMessageBox::warning(this, tr("The folder could not be renamed"),
                                    tr("This name is already in use in this folder. Please use a different name."),
                                    QMessageBox::Ok);
               return;
             }
           }
-          new_name = QDir::cleanPath(new_name);
-          qDebug("Renaming %s to %s", qPrintable(old_name), qPrintable(new_name));
-          // Rename file in files_path
-          files_path.replace(file_index, new_name);
-          // Rename in torrent files model too
-          PropListModel->setData(index, new_name_last);
-        } else {
-          // Folder renaming
-          QStringList path_items;
-          path_items << index.data().toString();
-          QModelIndex parent = PropListModel->parent(index);
-          while(parent.isValid()) {
-            path_items.prepend(parent.data().toString());
-            parent = PropListModel->parent(parent);
-          }
-          const QString &old_path = path_items.join("/");
-          path_items.removeLast();
-          path_items << new_name_last;
-          QString new_path = path_items.join("/");
-          if(!new_path.endsWith("/")) new_path += "/";
-          // Check for overwriting
+          // Replace path in all files
           for(uint i=0; i<nbFiles; ++i) {
             const QString &current_name = files_path.at(i);
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-            if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
-#else
-              if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
-#endif
-                QMessageBox::warning(this, tr("The folder could not be renamed"),
-                                     tr("This name is already in use in this folder. Please use a different name."),
-                                     QMessageBox::Ok);
-                return;
-              }
+            if(current_name.startsWith(old_path)) {
+              QString new_name = current_name;
+              new_name.replace(0, old_path.length(), new_path);
+              new_name = QDir::cleanPath(new_name);
+              qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name));
+              // Rename in files_path
+              files_path.replace(i, new_name);
             }
-            // Replace path in all files
-            for(uint i=0; i<nbFiles; ++i) {
-              const QString &current_name = files_path.at(i);
-              if(current_name.startsWith(old_path)) {
-                QString new_name = current_name;
-                new_name.replace(0, old_path.length(), new_path);
-                new_name = QDir::cleanPath(new_name);
-                qDebug("Rename %s to %s", qPrintable(current_name), qPrintable(new_name));
-                // Rename in files_path
-                files_path.replace(i, new_name);
-              }
-            }
-            // Rename folder in torrent files model too
-            PropListModel->setData(index, new_name_last);
           }
+          // Rename folder in torrent files model too
+          PropListModel->setData(index, new_name_last);
         }
       }
+    }
 
-      void torrentAdditionDialog::updateDiskSpaceLabels() {
-        qDebug("Updating disk space label...");
-        const long long available = misc::freeDiskSpaceOnPath(misc::expandPath(savePathTxt->currentText()));
-        lbl_disk_space->setText(misc::friendlyUnit(available));
-        if(!is_magnet) {
-          // Determine torrent size
-          qulonglong torrent_size = 0;
-          if(t->num_files() > 1) {
-            const unsigned int nbFiles = t->num_files();
-            const std::vector<int> &priorities = PropListModel->getFilesPriorities(nbFiles);
+    void torrentAdditionDialog::updateDiskSpaceLabels() {
+      qDebug("Updating disk space label...");
+      const long long available = misc::freeDiskSpaceOnPath(misc::expandPath(savePathTxt->currentText()));
+      lbl_disk_space->setText(misc::friendlyUnit(available));
+      if(!is_magnet) {
+        // Determine torrent size
+        qulonglong torrent_size = 0;
+        if(t->num_files() > 1) {
+          const unsigned int nbFiles = t->num_files();
+          const std::vector<int> &priorities = PropListModel->getFilesPriorities(nbFiles);
 
-            for(unsigned int i=0; i<nbFiles; ++i) {
-              if(priorities[i] > 0)
-                torrent_size += t->file_at(i).size;
-            }
-          } else {
-            torrent_size = t->total_size();
+          for(unsigned int i=0; i<nbFiles; ++i) {
+            if(priorities[i] > 0)
+              torrent_size += t->file_at(i).size;
           }
-          lbl_torrent_size->setText(misc::friendlyUnit(torrent_size));
-
-          // Check if free space is sufficient
-          if(available > 0) {
-            if((unsigned long long)available > torrent_size) {
-              // Space is sufficient
-              label_space_msg->setText(tr("(%1 left after torrent download)", "e.g. (100MiB left after torrent download)").arg(misc::friendlyUnit(available-torrent_size)));
-            } else {
-              // Space is unsufficient
-              label_space_msg->setText("<font color=\"red\">"+tr("(%1 more are required to download)", "e.g. (100MiB more are required to download)").arg(misc::friendlyUnit(torrent_size-available))+"</font>");
-            }
-          } else {
-            // Available disk space is unknown
-            label_space_msg->setText("");
-          }
-        }
-      }
-
-      void torrentAdditionDialog::on_browseButton_clicked(){
-        QString new_path;
-        if(!is_magnet && t->num_files() == 1) {
-          new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText());
         } else {
-          QString root_folder;
-          QString truncated_path = getCurrentTruncatedSavePath(&root_folder);
-          if(!truncated_path.isEmpty() && QDir(truncated_path).exists()){
-            new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), truncated_path);
-          }else{
-            new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
-          }
-          if(!new_path.isEmpty()) {
-            QStringList path_parts = new_path.replace("\\", "/").split("/");
-            if(path_parts.last().isEmpty())
-              path_parts.removeLast();
-            // Append label
-            const QString &label_name = comboLabel->currentText();
-            if(QDir(new_path) == QDir(defaultSavePath) && !label_name.isEmpty())
-              path_parts << label_name;
-            // Append root folder
-            if(!root_folder.isEmpty())
-              path_parts << root_folder;
-            // Construct new_path
-            new_path = path_parts.join(QDir::separator());
+          torrent_size = t->total_size();
+        }
+        lbl_torrent_size->setText(misc::friendlyUnit(torrent_size));
+
+        // Check if free space is sufficient
+        if(available > 0) {
+          if((unsigned long long)available > torrent_size) {
+            // Space is sufficient
+            label_space_msg->setText(tr("(%1 left after torrent download)", "e.g. (100MiB left after torrent download)").arg(misc::friendlyUnit(available-torrent_size)));
+          } else {
+            // Space is unsufficient
+            label_space_msg->setText("<font color=\"red\">"+tr("(%1 more are required to download)", "e.g. (100MiB more are required to download)").arg(misc::friendlyUnit(torrent_size-available))+"</font>");
           }
+        } else {
+          // Available disk space is unknown
+          label_space_msg->setText("");
+        }
+      }
+    }
+
+    void torrentAdditionDialog::on_browseButton_clicked(){
+      Q_ASSERT(!is_magnet);
+      QString new_path;
+      if(t->num_files() == 1) {
+        new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), savePathTxt->currentText());
+      } else {
+        QString root_folder;
+        QString truncated_path = getCurrentTruncatedSavePath(&root_folder);
+        if(!truncated_path.isEmpty() && QDir(truncated_path).exists()){
+          new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), truncated_path);
+        }else{
+          new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
         }
         if(!new_path.isEmpty()) {
-          // Check if this new path already exists in the list
-          QString new_truncated_path = getTruncatedSavePath(new_path);
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-          const int cur_index = path_history.indexOf(QRegExp(new_truncated_path, Qt::CaseInsensitive));
-#else
-          const int cur_index = path_history.indexOf(QRegExp(new_truncated_path, Qt::CaseSensitive));
-#endif
-          if(cur_index >= 0) {
-            savePathTxt->setCurrentIndex(cur_index);
-          }
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-          new_path = new_path.replace("/", "\\");
-#endif
-          savePathTxt->setEditText(new_path);
+          QStringList path_parts = new_path.replace("\\", "/").split("/");
+          if(path_parts.last().isEmpty())
+            path_parts.removeLast();
+          // Append label
+          const QString &label_name = comboLabel->currentText();
+          if(QDir(new_path) == QDir(defaultSavePath) && !label_name.isEmpty())
+            path_parts << label_name;
+          // Append root folder
+          if(!root_folder.isEmpty())
+            path_parts << root_folder;
+          // Construct new_path
+          new_path = path_parts.join(QDir::separator());
         }
       }
+      if(!new_path.isEmpty()) {
+        // Check if this new path already exists in the list
+        QString new_truncated_path = getTruncatedSavePath(new_path);
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+        const int cur_index = path_history.indexOf(QRegExp(new_truncated_path, Qt::CaseInsensitive));
+#else
+        const int cur_index = path_history.indexOf(QRegExp(new_truncated_path, Qt::CaseSensitive));
+#endif
+        if(cur_index >= 0) {
+          savePathTxt->setCurrentIndex(cur_index);
+        }
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+        new_path = new_path.replace("/", "\\");
+#endif
+        savePathTxt->setEditText(new_path);
+      }
+    }
 
-      void torrentAdditionDialog::on_CancelButton_clicked(){
+    void torrentAdditionDialog::on_CancelButton_clicked(){
+      close();
+    }
+
+    bool torrentAdditionDialog::allFiltered() const {
+      Q_ASSERT(!is_magnet);
+      return PropListModel->allFiltered();
+    }
+
+    void torrentAdditionDialog::savePiecesPriorities(){
+      qDebug("Saving pieces priorities");
+      Q_ASSERT(!is_magnet);
+      const std::vector<int> &priorities = PropListModel->getFilesPriorities(t->num_files());
+      TorrentTempData::setFilesPriority(hash, priorities);
+    }
+
+    void torrentAdditionDialog::on_OkButton_clicked(){
+      if(savePathTxt->currentText().trimmed().isEmpty()){
+        QMessageBox::critical(0, tr("Empty save path"), tr("Please enter a save path"));
+        return;
+      }
+      QString save_path = savePathTxt->currentText();
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+      save_path = save_path.replace("\\", "/");
+#endif
+      save_path = misc::expandPath(save_path);
+      if(!is_magnet && t->num_files() == 1) {
+        // Remove file name
+        QStringList parts = save_path.split("/");
+        const QString single_file_name = parts.takeLast();
+        Q_ASSERT(files_path.isEmpty());
+        files_path << single_file_name;
+        save_path = parts.join("/");
+      }
+      QDir savePath(save_path);
+      const QString &current_label = comboLabel->currentText().trimmed();
+      if (!current_label.isEmpty() && !misc::isValidFileSystemName(current_label)) {
+        QMessageBox::warning(this, tr("Invalid label name"), tr("Please don't use any special characters in the label name."));
+        return;
+      }
+      // Save savepath
+      TorrentTempData::setSavePath(hash, savePath.path());
+      qDebug("Torrent label is: %s", qPrintable(comboLabel->currentText().trimmed()));
+      if(!current_label.isEmpty())
+        TorrentTempData::setLabel(hash, current_label);
+      // Is download sequential?
+      TorrentTempData::setSequential(hash, checkIncrementalDL->isChecked());
+      // Save files path
+      // Loads files path in the torrent
+      if(!is_magnet) {
+        bool path_changed = false;
+        for(uint i=0; i<nbFiles; ++i) {
+#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
+          if(files_path.at(i).compare(misc::toQStringU(t->file_at(i).path.string()), Qt::CaseSensitive) != 0) {
+#else
+            if(files_path.at(i).compare(misc::toQStringU(t->file_at(i).path.string()), Qt::CaseInsensitive) != 0) {
+#endif
+              path_changed = true;
+              break;
+            }
+          }
+          if(path_changed) {
+            qDebug("Changing files paths");
+            TorrentTempData::setFilesPath(hash, files_path);
+          }
+        }
+#if LIBTORRENT_VERSION_MINOR > 14
+        // Skip file checking and directly start seeding
+        if(addInSeed->isChecked()) {
+          // Check if local file(s) actually exist
+          if(is_magnet || QFile::exists(savePathTxt->currentText())) {
+            TorrentTempData::setSeedingMode(hash, true);
+          } else {
+            QMessageBox::warning(0, tr("Seeding mode error"), tr("You chose to skip file checking. However, local files do not seem to exist in the current destionation folder. Please disable this feature or update the save path."));
+            return;
+          }
+        }
+#endif
+        // Check if there is at least one selected file
+        if(!is_magnet && t->num_files() > 1 && allFiltered()){
+          QMessageBox::warning(0, tr("Invalid file selection"), tr("You must select at least one file in the torrent"));
+          return;
+        }
+        // Save path history
+        saveTruncatedPathHistory();
+        // Check if savePath exists
+        if(!savePath.exists()){
+          if(!savePath.mkpath(savePath.path())){
+            QMessageBox::critical(0, tr("Save path creation error"), tr("Could not create the save path"));
+            return;
+          }
+        }
+        // save filtered files
+        if(!is_magnet && t->num_files() > 1)
+          savePiecesPriorities();
+        // Add to download list
+        QTorrentHandle h;
+        if(is_magnet)
+          h = BTSession->addMagnetUri(from_url, false);
+        else
+          h = BTSession->addTorrent(filePath, false, from_url);
+        if(addInPause->isChecked() && h.is_valid()) {
+          h.pause();
+          emit torrentPaused(h);
+        }
+        // Close the dialog
         close();
       }
 
-      bool torrentAdditionDialog::allFiltered() const {
-        return PropListModel->allFiltered();
-      }
-
-      void torrentAdditionDialog::savePiecesPriorities(){
-        qDebug("Saving pieces priorities");
-        const std::vector<int> &priorities = PropListModel->getFilesPriorities(t->num_files());
-        TorrentTempData::setFilesPriority(hash, priorities);
-      }
-
-      void torrentAdditionDialog::on_OkButton_clicked(){
-        if(savePathTxt->currentText().trimmed().isEmpty()){
-          QMessageBox::critical(0, tr("Empty save path"), tr("Please enter a save path"));
-          return;
+      void torrentAdditionDialog::resetComboLabelIndex(QString text) {
+        // Select first index
+        if(text != comboLabel->itemText(comboLabel->currentIndex())) {
+          comboLabel->setItemText(0, text);
+          comboLabel->setCurrentIndex(0);
         }
+      }
+
+      void torrentAdditionDialog::updateLabelInSavePath(QString label) {
+        if(appendLabelToSavePath) {
+          // Update Label in combobox
+          savePathTxt->setItemText(0, misc::updateLabelInSavePath(defaultSavePath, savePathTxt->itemText(0), old_label, label));
+          // update edit text
+          savePathTxt->setEditText(misc::updateLabelInSavePath(defaultSavePath, savePathTxt->currentText(), old_label, label));
+          old_label = label;
+        }
+      }
+
+      void torrentAdditionDialog::updateSavePathCurrentText(QString path) {
+        savePathTxt->setItemText(savePathTxt->currentIndex(), path);
+        path_history.replace(savePathTxt->currentIndex(), getCurrentTruncatedSavePath());
+        QString root_folder_or_file_name = "";
+        getCurrentTruncatedSavePath(&root_folder_or_file_name);
+        // Update other combo items
+        for(int i=0; i<savePathTxt->count(); ++i) {
+          if(i == savePathTxt->currentIndex()) continue;
+          QString item_path = path_history.at(i);
+          if(item_path.isEmpty()) continue;
+          // Append label
+          if(i == 0 && appendLabelToSavePath && QDir(item_path) == QDir(defaultSavePath) && !comboLabel->currentText().isEmpty())
+            item_path += comboLabel->currentText() + "/";
+          // Append root_folder or filename
+          if(!root_folder_or_file_name.isEmpty())
+            item_path += root_folder_or_file_name;
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+          item_path = item_path.replace("/", "\\");
+#endif
+          savePathTxt->setItemText(i, item_path);
+        }
+      }
+
+      QString torrentAdditionDialog::getCurrentTruncatedSavePath(QString* root_folder_or_file_name) const {
         QString save_path = savePathTxt->currentText();
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-        save_path = save_path.replace("\\", "/");
-#endif
+        return getTruncatedSavePath(save_path, root_folder_or_file_name);
+      }
+
+      // Get current save path without the torrent root folder nor the label label
+      QString torrentAdditionDialog::getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name) const {
+        // Expand and clean path (~, .., .)
         save_path = misc::expandPath(save_path);
-        if(!is_magnet && t->num_files() == 1) {
-          // Remove file name
-          QStringList parts = save_path.split("/");
-          const QString single_file_name = parts.takeLast();
-          Q_ASSERT(files_path.isEmpty());
-          files_path << single_file_name;
-          save_path = parts.join("/");
+        QStringList parts = save_path.replace("\\", "/").split("/");
+        // Remove torrent root folder
+        if(!QDir(save_path).exists() || (!is_magnet && t->num_files() == 1)) {
+          QString tmp = parts.takeLast();
+          if(root_folder_or_file_name)
+            *root_folder_or_file_name = tmp;
         }
-        QDir savePath(save_path);
-        const QString &current_label = comboLabel->currentText().trimmed();
-        if (!current_label.isEmpty() && !misc::isValidFileSystemName(current_label)) {
-          QMessageBox::warning(this, tr("Invalid label name"), tr("Please don't use any special characters in the label name."));
-          return;
+        // Remove label
+        if(appendLabelToSavePath && savePathTxt->currentIndex() == 0 && parts.last() == comboLabel->currentText()) {
+          parts.removeLast();
         }
-        // Save savepath
-        TorrentTempData::setSavePath(hash, savePath.path());
-        qDebug("Torrent label is: %s", qPrintable(comboLabel->currentText().trimmed()));
-        if(!current_label.isEmpty())
-          TorrentTempData::setLabel(hash, current_label);
-        // Is download sequential?
-        TorrentTempData::setSequential(hash, checkIncrementalDL->isChecked());
-        // Save files path
-        // Loads files path in the torrent
-        if(!is_magnet) {
-          bool path_changed = false;
-          for(uint i=0; i<nbFiles; ++i) {
+        QString truncated_path = parts.join("/");
+        if(!truncated_path.endsWith("/"))
+          truncated_path += "/";
+        qDebug("Truncated save path: %s", qPrintable(truncated_path));
+        return truncated_path;
+      }
+
+      void torrentAdditionDialog::saveTruncatedPathHistory() {
+        QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
+        const QString current_save_path = getCurrentTruncatedSavePath();
+        // Get current history
+        QStringList history = settings.value("TorrentAdditionDlg/save_path_history").toStringList();
 #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-            if(files_path.at(i).compare(misc::toQStringU(t->file_at(i).path.string()), Qt::CaseSensitive) != 0) {
+        if(!history.contains(current_save_path, Qt::CaseSensitive)) {
 #else
-              if(files_path.at(i).compare(misc::toQStringU(t->file_at(i).path.string()), Qt::CaseInsensitive) != 0) {
+          if(!history.contains(current_save_path, Qt::CaseInsensitive)) {
 #endif
-                path_changed = true;
-                break;
-              }
-            }
-            if(path_changed) {
-              qDebug("Changing files paths");
-              TorrentTempData::setFilesPath(hash, files_path);
-            }
-          }
-#if LIBTORRENT_VERSION_MINOR > 14
-          // Skip file checking and directly start seeding
-          if(addInSeed->isChecked()) {
-            // Check if local file(s) actually exist
-            if(is_magnet || QFile::exists(savePathTxt->currentText())) {
-              TorrentTempData::setSeedingMode(hash, true);
-            } else {
-              QMessageBox::warning(0, tr("Seeding mode error"), tr("You chose to skip file checking. However, local files do not seem to exist in the current destionation folder. Please disable this feature or update the save path."));
-              return;
-            }
-          }
-#endif
-          // Check if there is at least one selected file
-          if(!is_magnet && t->num_files() > 1 && allFiltered()){
-            QMessageBox::warning(0, tr("Invalid file selection"), tr("You must select at least one file in the torrent"));
-            return;
-          }
-          // Save path history
-          saveTruncatedPathHistory();
-          // Check if savePath exists
-          if(!savePath.exists()){
-            if(!savePath.mkpath(savePath.path())){
-              QMessageBox::critical(0, tr("Save path creation error"), tr("Could not create the save path"));
-              return;
-            }
-          }
-          // save filtered files
-          if(!is_magnet && t->num_files() > 1)
-            savePiecesPriorities();
-          // Add to download list
-          QTorrentHandle h;
-          if(is_magnet)
-            h = BTSession->addMagnetUri(from_url, false);
-          else
-            h = BTSession->addTorrent(filePath, false, from_url);
-          if(addInPause->isChecked() && h.is_valid()) {
-            h.pause();
-            emit torrentPaused(h);
-          }
-          // Close the dialog
-          close();
-        }
-
-        void torrentAdditionDialog::resetComboLabelIndex(QString text) {
-          // Select first index
-          if(text != comboLabel->itemText(comboLabel->currentIndex())) {
-            comboLabel->setItemText(0, text);
-            comboLabel->setCurrentIndex(0);
+            // Add save path to history
+            history << current_save_path;
+            // Limit list size
+            if(history.size() > 8)
+              history.removeFirst();
+            // Save history
+            settings.setValue("TorrentAdditionDlg/save_path_history", history);
           }
         }
 
-        void torrentAdditionDialog::updateLabelInSavePath(QString label) {
-          if(appendLabelToSavePath) {
-            // Update Label in combobox
-            savePathTxt->setItemText(0, misc::updateLabelInSavePath(defaultSavePath, savePathTxt->itemText(0), old_label, label));
-            // update edit text
-            savePathTxt->setEditText(misc::updateLabelInSavePath(defaultSavePath, savePathTxt->currentText(), old_label, label));
-            old_label = label;
-          }
-        }
-
-        void torrentAdditionDialog::updateSavePathCurrentText(QString path) {
-          savePathTxt->setItemText(savePathTxt->currentIndex(), path);
-          path_history.replace(savePathTxt->currentIndex(), getCurrentTruncatedSavePath());
-          QString root_folder_or_file_name = "";
-          getCurrentTruncatedSavePath(&root_folder_or_file_name);
-          // Update other combo items
-          for(int i=0; i<savePathTxt->count(); ++i) {
-            if(i == savePathTxt->currentIndex()) continue;
-            QString item_path = path_history.at(i);
-            if(item_path.isEmpty()) continue;
-            // Append label
-            if(i == 0 && appendLabelToSavePath && QDir(item_path) == QDir(defaultSavePath) && !comboLabel->currentText().isEmpty())
-              item_path += comboLabel->currentText() + "/";
-            // Append root_folder or filename
-            if(!root_folder_or_file_name.isEmpty())
-              item_path += root_folder_or_file_name;
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-            item_path = item_path.replace("/", "\\");
-#endif
-            savePathTxt->setItemText(i, item_path);
-          }
-        }
-
-        QString torrentAdditionDialog::getCurrentTruncatedSavePath(QString* root_folder_or_file_name) const {
-          QString save_path = savePathTxt->currentText();
-          return getTruncatedSavePath(save_path, root_folder_or_file_name);
-        }
-
-        // Get current save path without the torrent root folder nor the label label
-        QString torrentAdditionDialog::getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name) const {
-          // Expand and clean path (~, .., .)
-          save_path = misc::expandPath(save_path);
-          QStringList parts = save_path.replace("\\", "/").split("/");
-          // Remove torrent root folder
-          if(!QDir(save_path).exists() || (!is_magnet && t->num_files() == 1)) {
-            QString tmp = parts.takeLast();
-            if(root_folder_or_file_name)
-              *root_folder_or_file_name = tmp;
-          }
-          // Remove label
-          if(appendLabelToSavePath && savePathTxt->currentIndex() == 0 && parts.last() == comboLabel->currentText()) {
-            parts.removeLast();
-          }
-          QString truncated_path = parts.join("/");
-          if(!truncated_path.endsWith("/"))
-            truncated_path += "/";
-          qDebug("Truncated save path: %s", qPrintable(truncated_path));
-          return truncated_path;
-        }
-
-        void torrentAdditionDialog::saveTruncatedPathHistory() {
+        void torrentAdditionDialog::loadSavePathHistory() {
           QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-          const QString current_save_path = getCurrentTruncatedSavePath();
-          // Get current history
-          QStringList history = settings.value("TorrentAdditionDlg/save_path_history").toStringList();
-#if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-          if(!history.contains(current_save_path, Qt::CaseSensitive)) {
-#else
-            if(!history.contains(current_save_path, Qt::CaseInsensitive)) {
+          // Load save path history
+          QStringList raw_path_history = settings.value("TorrentAdditionDlg/save_path_history").toStringList();
+          foreach(const QString &sp, raw_path_history) {
+            if(QDir(sp) != QDir(defaultSavePath)) {
+              QString dsp = sp;
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+              dsp = dsp.replace("/", "\\");
 #endif
-              // Add save path to history
-              history << current_save_path;
-              // Limit list size
-              if(history.size() > 8)
-                history.removeFirst();
-              // Save history
-              settings.setValue("TorrentAdditionDlg/save_path_history", history);
+              path_history << sp;
+              savePathTxt->addItem(dsp);
             }
           }
-
-          QStringList torrentAdditionDialog::getSavePathHistory() const {
-            QIniSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
-            return settings.value("TorrentAdditionDlg/save_path_history").toStringList();
-          }
+        }
diff --git a/src/torrentadditiondlg.h b/src/torrentadditiondlg.h
index dc2d50161..2f9bd9bdb 100644
--- a/src/torrentadditiondlg.h
+++ b/src/torrentadditiondlg.h
@@ -70,6 +70,7 @@ public:
   void showLoad(QString filePath, QString from_url=QString::null);
   QString getCurrentTruncatedSavePath(QString* root_folder_or_file_name = 0) const;
   QString getTruncatedSavePath(QString save_path, QString* root_folder_or_file_name = 0) const;
+  bool allFiltered() const;
 
 public slots:
   void displayContentListMenu(const QPoint&);
@@ -77,13 +78,12 @@ public slots:
   void updateDiskSpaceLabels();
   void on_browseButton_clicked();
   void on_CancelButton_clicked();
-  bool allFiltered() const;
   void savePiecesPriorities();
   void on_OkButton_clicked();
   void renameTorrentNameInModel(QString file_path);
   void hideTorrentContent();
   void saveTruncatedPathHistory();
-  QStringList getSavePathHistory() const;
+  void loadSavePathHistory();
   void updateLabelInSavePath(QString label);
   void updateSavePathCurrentText(QString path);
   void resetComboLabelIndex(QString text);