diff --git a/src/Preferences.cs b/src/Preferences.cs
index 19d4fd3..706ba47 100644
--- a/src/Preferences.cs
+++ b/src/Preferences.cs
@@ -61,7 +61,6 @@ namespace FSpot
 
 		public const string EXPORT_EMAIL_SIZE = APP_FSPOT + "export/email/size";
 		public const string EXPORT_EMAIL_ROTATE = APP_FSPOT + "export/email/auto_rotate";
-		public const string EXPORT_EMAIL_DELETE_TIMEOUT_SEC = APP_FSPOT + "export/email/delete_timeout_seconds";
 
 		public const string IMPORT_GUI_ROLL_HISTORY = APP_FSPOT + "import/gui_roll_history";
 
@@ -155,8 +154,6 @@ namespace FSpot
 			case EXPORT_EMAIL_ROTATE:
 			case VIEWER_INTERPOLATION:
 				return true;
-			case EXPORT_EMAIL_DELETE_TIMEOUT_SEC:
-				return 30;	// delete temporary email pictures after 30 seconds
 			case VIEWER_TRANSPARENCY:
 				return "NONE";
 			case VIEWER_TRANS_COLOR:
diff --git a/src/SendEmail.cs b/src/SendEmail.cs
index a78ce78..75752c0 100644
--- a/src/SendEmail.cs
+++ b/src/SendEmail.cs
@@ -203,26 +203,6 @@ namespace FSpot {
 		}
 
 
-		private bool DeleteTempFile ()
-		{
-//			System.Console.WriteLine ("Lets delete all temp files");
-
-			// Lets delete all the temporary files now
-			for (int k = 0; k < tmp_paths.Count; k++) {
-				if (System.IO.File.Exists((string) tmp_paths[k])) {
-					System.IO.File.Delete ((string) tmp_paths[k]);
-//					System.Console.WriteLine ("Lets delete temp file {0}", tmp_paths[k]);
-				}
-			}
-			
-			if (System.IO.Directory.Exists(tmp_mail_dir)) {
-				System.IO.Directory.Delete(tmp_mail_dir);
-//				System.Console.WriteLine ("Lets delete temp dir {0}", tmp_mail_dir);
-			}
-			
-			return false;
-		}
-
 		private void HandleResponse (object sender, Gtk.ResponseArgs args)
 		{
 			int size = 0;
@@ -353,16 +333,6 @@ namespace FSpot {
 					break;
 				}
 				                
-				// Check if we have any temporary files to be deleted
-				if (tmp_paths.Count > 0) {
-					// Fetch timeout value from preferences. In seconds. Needs to be multiplied with 1000 to get msec
-					uint delete_timeout;
-					delete_timeout = (uint) (Preferences.Get<int> (Preferences.EXPORT_EMAIL_DELETE_TIMEOUT_SEC));
-					delete_timeout = delete_timeout * 1000; // to get milliseconds.
-
-					// Start a timer and when it occurs, delete the temp files.
-					GLib.Timeout.Add (delete_timeout, new GLib.TimeoutHandler (DeleteTempFile));
-				}
 			}
 		}
 	}
