diff --git a/Changelog b/Changelog
index d5b4bcbc9..17101ec65 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,6 @@
 * Unreleased - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
     - FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
+    - FEATURE: Remember previous save paths in torrent addition dialog
     - FEATURE: Max number of half-open connections can now be edited
     - FEATURE: Added support for strict super seeding
     - FEATURE: The user can force listening on a particular network interface
diff --git a/src/torrentadditiondlg.cpp b/src/torrentadditiondlg.cpp
index 3d6d7bac4..b5ae43d0c 100644
--- a/src/torrentadditiondlg.cpp
+++ b/src/torrentadditiondlg.cpp
@@ -53,508 +53,584 @@ torrentAdditionDialog::torrentAdditionDialog(GUI *parent, Bittorrent* _BTSession
   defaultSavePath = Preferences::getSavePath();
   appendLabelToSavePath = Preferences::appendTorrentLabel();
   QString display_path = defaultSavePath;
+  if(!display_path.endsWith("/") && !display_path.endsWith("\\"))
+    display_path += "/";
 #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
   display_path = display_path.replace("/", "\\");
 #endif
-  savePathTxt->setText(display_path);
-  if(Preferences::addTorrentsInPause()) {
-    addInPause->setChecked(true);
-    //addInPause->setEnabled(false);
-  }
+  savePathTxt->addItem(display_path);
+  // Load save path history
+  const QStringList path_history = getSavePathHistory();
+  foreach(const QString &sp, 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
+        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 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() {
-  QSettings 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() {
-  QSettings 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);
-  }
-  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 += collapseAllButton->height();
-  collapseAllButton->setVisible(false);
-  expandAllButton->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->text();
-    if(!save_path.endsWith(QDir::separator()))
-      save_path += QDir::separator();
-    savePathTxt->setText(save_path + fileName);
-  }
-  fileNameLbl->setText(QString::fromUtf8("<center><b>")+fileName+QString::fromUtf8("</b></center>"));
-  // Update display
-  updateDiskSpaceLabels();
-  // Load custom labels
-  QSettings 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(textChanged(QString)), this, SLOT(renameTorrentNameInModel(QString)));
-  }
-  QString root_folder = misc::truncateRootFolder(t);
-  QString save_path = savePathTxt->text();
-#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->setText(save_path + root_folder + QDir::separator());
-  }
-  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->setText(save_path+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);
-  }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);
-    // 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());
-    }
-  }
-  connect(savePathTxt, SIGNAL(textChanged(QString)), this, SLOT(updateDiskSpaceLabels()));
-  updateDiskSpaceLabels();
-  // Load custom labels
-  QSettings 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(actionNormal);
-  subMenu.addAction(actionHigh);
-  subMenu.addAction(actionMaximum);
-  myFilesLlistMenu.addMenu(&subMenu);
-  // Call menu
-  QAction *act = myFilesLlistMenu.exec(QCursor::pos());
-  if(act) {
-    if(act == actRename) {
-      renameSelectedFile();
+  void torrentAdditionDialog::readSettings() {
+    QSettings 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 {
-      int prio = 1;
-      if(act == actionHigh) {
-        prio = HIGH;
-      } else {
-        if(act == actionMaximum) {
-          prio = MAXIMUM;
-        }
-      }
-      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);
+      for(int i=0; i<contentColsWidths.size(); ++i) {
+        torrentContentList->setColumnWidth(i, contentColsWidths.at(i));
       }
     }
   }
-}
 
-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::saveSettings() {
+    QSettings 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);
+    }
+    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 += collapseAllButton->height();
+    collapseAllButton->setVisible(false);
+    expandAllButton->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;
     }
-    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;
+    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>"));
+    // Update display
+    updateDiskSpaceLabels();
+    // Load custom labels
+    QSettings 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"));
       }
-      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) {
+      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
-            // 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;
+    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 + QDir::separator());
+      // Update other combo items
+      for(int i=0; i<savePathTxt->count(); ++i) {
+        savePathTxt->setItemText(i, savePathTxt->itemText(i) + root_folder + QDir::separator());
+      }
+    }
+    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);
+    }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);
+      // 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());
+      }
+    }
+    connect(savePathTxt, SIGNAL(editTextChanged(QString)), this, SLOT(updateDiskSpaceLabels()));
+    updateDiskSpaceLabels();
+    // Load custom labels
+    QSettings 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(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 {
+          if(act == actionMaximum) {
+            prio = MAXIMUM;
           }
         }
-        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);
+        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);
         }
-        const QString &old_path = path_items.join("/");
+      }
+    }
+  }
+
+  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);
+        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_path = path_items.join("/");
-        if(!new_path.endsWith("/")) new_path += "/";
-        // Check for overwriting
+        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) {
-          const QString &current_name = files_path.at(i);
+          if(i == file_index) continue;
 #if defined(Q_WS_X11) || defined(Q_WS_MAC) || defined(Q_WS_QWS)
-          if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
+          if(files_path.at(i).compare(new_name, Qt::CaseSensitive) == 0) {
 #else
-            if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
+            if(files_path.at(i).compare(new_name, Qt::CaseInsensitive) == 0) {
 #endif
-              QMessageBox::warning(this, tr("The folder could not be renamed"),
+              // 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;
             }
           }
-          // Replace path in all files
+          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
           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);
-        }
-      }
-    }
-
-    void torrentAdditionDialog::updateDiskSpaceLabels() {
-      const long long available = misc::freeDiskSpaceOnPath(misc::expandPath(savePathTxt->text()));
-      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();
-        }
-        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;
-      QString save_path = savePathTxt->text();
-#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) {
-        new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), save_path);
-      } else {
-        const QDir saveDir(save_path);
-        if(!save_path.isEmpty() && saveDir.exists()){
-          new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath());
-        }else{
-          new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
-        }
-      }
-      if(!new_path.isEmpty()){
-#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
-        new_path = new_path.replace("/", "\\");
-#endif
-        savePathTxt->setText(new_path);
-      }
-    }
-
-    void torrentAdditionDialog::on_CancelButton_clicked(){
-      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->text().trimmed().isEmpty()){
-        QMessageBox::critical(0, tr("Empty save path"), tr("Please enter a save path"));
-        return;
-      }
-      QString save_path = savePathTxt->text();
-#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("/", QString::SkipEmptyParts);
-        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);
-      // 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;
-        }
-      }
-      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) {
+            if(current_name.startsWith(new_path, Qt::CaseSensitive)) {
 #else
-            if(files_path.at(i).compare(misc::toQStringU(t->file_at(i).path.string()), Qt::CaseInsensitive) != 0) {
+              if(current_name.startsWith(new_path, Qt::CaseInsensitive)) {
 #endif
-              path_changed = true;
-              break;
+                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(path_changed) {
-            qDebug("Changing files paths");
-            TorrentTempData::setFilesPath(hash, files_path);
+            // 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);
           }
         }
-#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->text())) {
-            TorrentTempData::setSeedingMode(hash, true);
+      }
+
+      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 {
-            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;
+            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(){
+        QString new_path;
+        QString save_path = savePathTxt->currentText();
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+        save_path = save_path.replace("\\", "/");
 #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 = misc::expandPath(save_path);
+        if(!is_magnet && t->num_files() == 1) {
+          new_path = QFileDialog::getSaveFileName(this, tr("Choose save path"), save_path);
+        } else {
+          const QDir saveDir(save_path);
+          if(!save_path.isEmpty() && saveDir.exists()){
+            new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), saveDir.absolutePath());
+          }else{
+            new_path = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
+          }
         }
-        // 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);
+        if(!new_path.isEmpty()){
+#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
+          new_path = new_path.replace("/", "\\");
+#endif
+          savePathTxt->setEditText(new_path);
         }
+      }
+
+      void torrentAdditionDialog::on_CancelButton_clicked(){
         close();
       }
 
-      void torrentAdditionDialog::updateLabelInSavePath(QString label) {
-        if(appendLabelToSavePath) {
-          savePathTxt->setText(misc::updateLabelInSavePath(defaultSavePath, savePathTxt->text(), old_label, label));
-          old_label = label;
-        }
+      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;
+        }
+        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);
+        // 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;
+          }
+        }
+        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 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);
+          }
+          // Save path history
+          saveTruncatedPathHistory();
+          // Close the dialog
+          close();
+        }
+
+        void torrentAdditionDialog::updateLabelInSavePath(QString label) {
+          if(appendLabelToSavePath) {
+            savePathTxt->setEditText(misc::updateLabelInSavePath(defaultSavePath, savePathTxt->currentText(), old_label, label));
+            // Update other combo items
+            for(int i=0; i<savePathTxt->count(); ++i) {
+              savePathTxt->setItemText(i, misc::updateLabelInSavePath(defaultSavePath, savePathTxt->itemText(i), old_label, label));
+            }
+            old_label = label;
+          }
+        }
+
+        // Get current save path without last part and without label
+        QString torrentAdditionDialog::getCurrentTruncatedSavePath() const {
+          QStringList parts = savePathTxt->currentText().replace("\\", "/").split("/");
+          if(parts.last().isEmpty())
+            parts.removeLast();
+          // Remove last part
+          parts.removeLast();
+          if(appendLabelToSavePath) {
+            // Remove label
+            if(parts.last() == comboLabel->currentText())
+              parts.removeLast();
+          }
+          const QString truncated_path = parts.join("/")+"/";
+          qDebug("Truncated save path: %s", qPrintable(truncated_path));
+          return truncated_path;
+        }
+
+        void torrentAdditionDialog::saveTruncatedPathHistory() {
+          QSettings 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)) {
+#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);
+            }
+          }
+
+          QStringList torrentAdditionDialog::getSavePathHistory() const {
+            QSettings 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 c2cd1bf13..51246258f 100644
--- a/src/torrentadditiondlg.h
+++ b/src/torrentadditiondlg.h
@@ -68,6 +68,7 @@ public:
   void saveSettings();
   void showLoadMagnetURI(QString magnet_uri);
   void showLoad(QString filePath, QString from_url=QString::null);
+  QString getCurrentTruncatedSavePath() const;
 
 public slots:
   void displayContentListMenu(const QPoint&);
@@ -80,6 +81,8 @@ public slots:
   void on_OkButton_clicked();
   void renameTorrentNameInModel(QString file_path);
   void hideTorrentContent();
+  void saveTruncatedPathHistory();
+  QStringList getSavePathHistory() const;
 
 public slots:
   void updateLabelInSavePath(QString label);
diff --git a/src/ui/torrentadditiondlg.ui b/src/ui/torrentadditiondlg.ui
index 853febacc..655a8ce62 100644
--- a/src/ui/torrentadditiondlg.ui
+++ b/src/ui/torrentadditiondlg.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>585</width>
+    <width>560</width>
     <height>517</height>
    </rect>
   </property>
@@ -29,20 +29,14 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout">
-     <property name="spacing">
-      <number>6</number>
-     </property>
-     <property name="margin">
-      <number>0</number>
-     </property>
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="savePathLbl">
-       <property name="font">
-        <font>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
        <property name="text">
         <string>Save path:</string>
@@ -50,7 +44,17 @@
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="savePathTxt"/>
+      <widget class="QComboBox" name="savePathTxt">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+      </widget>
      </item>
      <item>
       <widget class="QToolButton" name="browseButton">