diff --git a/macosx/English.lproj/PrefsWindow.nib/classes.nib b/macosx/English.lproj/PrefsWindow.nib/classes.nib
index 3026fa2b9..96bd12dc9 100644
--- a/macosx/English.lproj/PrefsWindow.nib/classes.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/classes.nib
@@ -14,6 +14,7 @@
                 setAutoSpeedLimitCheck = id; 
                 setAutoSpeedLimitHour = id; 
                 setBadge = id; 
+                setCopyTorrents = id; 
                 setDownloadLocation = id; 
                 setNat = id; 
                 setPort = id; 
diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib
index fbdbeab2d..bdc83f12a 100644
Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index f5ffe5ef4..72ff578b5 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -66,6 +66,8 @@
 
 - (void) setQueueNumber:    (id) sender;
 
+- (void) setCopyTorrents: (id) sender;
+
 - (void) setDownloadLocation:   (id) sender;
 - (void) folderSheetShow:       (id) sender;
 
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index a50fb0c78..df500a2b4 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -321,7 +321,6 @@
     [[NSNotificationCenter defaultCenter] postNotificationName: @"AutoSpeedLimitChange" object: self];
 }
 
-#warning check if same value
 - (void) setAutoSpeedLimitHour: (id) sender
 {
     [[NSNotificationCenter defaultCenter] postNotificationName: @"AutoSpeedLimitChange" object: self];
@@ -367,12 +366,17 @@
         [fUpdater scheduleCheckWithInterval: seconds];
 }
 
-#warning out of range/wrong value
 - (void) setQueueNumber: (id) sender
 {
     [[NSNotificationCenter defaultCenter] postNotificationName: @"GlobalStartSettingChange" object: self];
 }
 
+- (void) setCopyTorrents: (id) sender
+{
+    if (![fDefaults boolForKey: @"SavePrivateTorrent"])
+        [fDefaults setBool: NO forKey: @"DeleteOriginalTorrent"];
+}
+
 - (void) setDownloadLocation: (id) sender
 {
     //download folder