diff --git a/src/options.ui b/src/options.ui
index fffc265bc..6769f9204 100644
--- a/src/options.ui
+++ b/src/options.ui
@@ -484,7 +484,7 @@
                        </sizepolicy>
                       </property>
                       <property name="title">
-                       <string comment="Action executed when doucle-clicking on an item in transfer (download/upload) list">Action for double click</string>
+                       <string comment="Action executed when doucle-clicking on an item in transfer (download/upload) list">Action on double click</string>
                       </property>
                       <layout class="QVBoxLayout" name="verticalLayout_4">
                        <item>
@@ -492,7 +492,7 @@
                          <item>
                           <widget class="QLabel" name="lblDlList_2">
                            <property name="text">
-                            <string>Download list:</string>
+                            <string>Downloading:</string>
                            </property>
                           </widget>
                          </item>
@@ -517,11 +517,6 @@
                              <string>Open folder</string>
                             </property>
                            </item>
-                           <item>
-                            <property name="text">
-                             <string>Show properties</string>
-                            </property>
-                           </item>
                           </widget>
                          </item>
                          <item>
@@ -544,7 +539,7 @@
                          <item>
                           <widget class="QLabel" name="lblUploadList">
                            <property name="text">
-                            <string>Seeding list:</string>
+                            <string>Completed:</string>
                            </property>
                           </widget>
                          </item>
@@ -560,11 +555,6 @@
                              <string>Open folder</string>
                             </property>
                            </item>
-                           <item>
-                            <property name="text">
-                             <string>Show properties</string>
-                            </property>
-                           </item>
                           </widget>
                          </item>
                          <item>
diff --git a/src/options_imp.cpp b/src/options_imp.cpp
index 5df39bdda..fa4f33009 100644
--- a/src/options_imp.cpp
+++ b/src/options_imp.cpp
@@ -573,9 +573,14 @@ void options_imp::loadOptions(){
     textScanDir->setText(strValue);
     enableDirScan(2);
   }
-  actionTorrentDlOnDblClBox->setCurrentIndex(settings.value(QString::fromUtf8("DblClOnTorDl"), 0).toInt());
-  actionTorrentFnOnDblClBox->setCurrentIndex(settings.value(QString::fromUtf8("DblClOnTorFn"), 0).toInt());
+  intValue = settings.value(QString::fromUtf8("DblClOnTorDl"), 0).toInt();
+  if(intValue >= actionTorrentDlOnDblClBox->count())
+    intValue = 0;
+  actionTorrentDlOnDblClBox->setCurrentIndex(intValue);
   intValue = settings.value(QString::fromUtf8("DblClOnTorFn"), 1).toInt();
+  if(intValue >= actionTorrentFnOnDblClBox->count())
+    intValue = 1;
+  actionTorrentFnOnDblClBox->setCurrentIndex(intValue);
   // End Downloads preferences
   settings.endGroup();
   // Connection preferences
diff --git a/src/reverseresolution.h b/src/reverseresolution.h
index 92ff999ac..cfeb90cce 100644
--- a/src/reverseresolution.h
+++ b/src/reverseresolution.h
@@ -115,7 +115,8 @@ protected slots:
     if(!ips.empty())
       cond.wakeOne();
     mut.unlock();
-    sender()->deleteLater();
+    delete sender();
+    //sender()->deleteLater();
   }
 
 protected: