diff -Naur f-spot-0.4.0/src/IconView.cs f-spot-0.4.0-new/src/IconView.cs
--- f-spot-0.4.0/src/IconView.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/IconView.cs	2007-09-17 20:48:54.000000000 +1200
@@ -865,9 +865,9 @@
 		if (DisplayDates) {
 			string date;
 			if (cell_width > 200) {
-				date = photo.Time.ToLocalTime ().ToString ();
+				date = photo.Time.ToString ();
 			} else {
-				date = photo.Time.ToLocalTime ().ToShortDateString ();
+				date = photo.Time.ToShortDateString ();
 			}
 
 			Pango.Layout layout = (Pango.Layout)date_layouts [date];
diff -Naur f-spot-0.4.0/src/Imaging/JpegFile.cs f-spot-0.4.0-new/src/Imaging/JpegFile.cs
--- f-spot-0.4.0/src/Imaging/JpegFile.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/Imaging/JpegFile.cs	2007-09-17 20:51:43.000000000 +1200
@@ -322,13 +322,13 @@
 						e = sub.Directory [0].Lookup (TagId.DateTimeOriginal);
 						
 						if (e != null)
-							return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+							return DirectoryEntry.DateTimeFromString (e.StringValue);
 					}
 					
 					e = ExifHeader.Directory.Lookup (TagId.DateTime);
 					
 					if (e != null)
-						return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+						return DirectoryEntry.DateTimeFromString (e.StringValue);
 					
 					return base.Date;
 #else
@@ -338,7 +338,7 @@
 					if (time_str == null || time_str == "") 
 						time_str = ExifData.LookupFirstValue (Exif.Tag.DateTime);
 					
-					time = Exif.ExifUtil.DateTimeFromString (time_str).ToUniversalTime (); 
+					time = Exif.ExifUtil.DateTimeFromString (time_str); 
 #endif
 				} catch (System.Exception e) {
 					Console.WriteLine (e);
diff -Naur f-spot-0.4.0/src/Imaging/MrwFile.cs f-spot-0.4.0-new/src/Imaging/MrwFile.cs
--- f-spot-0.4.0/src/Imaging/MrwFile.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/Imaging/MrwFile.cs	2007-09-17 20:51:56.000000000 +1200
@@ -201,7 +201,7 @@
 				DirectoryEntry e = this.Header.Directory.Lookup (TagId.DateTime);
 				
 				if (e != null)
-					return DirectoryEntry.DateTimeFromString (e.StringValue).ToUniversalTime ();
+					return DirectoryEntry.DateTimeFromString (e.StringValue);
 				else
 					return base.Date;
 			}
diff -Naur f-spot-0.4.0/src/InfoBox.cs f-spot-0.4.0-new/src/InfoBox.cs
--- f-spot-0.4.0/src/InfoBox.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/InfoBox.cs	2007-09-17 20:50:05.000000000 +1200
@@ -163,7 +163,7 @@
 				height = real_height.ToString ();
 			}
 #if USE_EXIF_DATE
-			date = img.Date.ToLocalTime ();
+			date = img.Date;
 #endif
 		}
 
@@ -275,8 +275,8 @@
 		date_label.Text = info.Date;
 #else
 		date_label.Text = String.Format ("{0}{2}{1}",
-						 photo.Time.ToLocalTime ().ToShortDateString (),
-						 photo.Time.ToLocalTime ().ToShortTimeString (),
+						 photo.Time.ToShortDateString (),
+						 photo.Time.ToShortTimeString (),
 						 Environment.NewLine);
 #endif
 		
diff -Naur f-spot-0.4.0/src/LastRollDialog.cs f-spot-0.4.0-new/src/LastRollDialog.cs
--- f-spot-0.4.0/src/LastRollDialog.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/LastRollDialog.cs	2007-09-17 20:49:32.000000000 +1200
@@ -85,7 +85,7 @@
 			for (uint k = 0; k < rolls.Length; k++)
 			{
 				uint numphotos = rollstore.PhotosInRoll (rolls [k]);
-				DateTime date = rolls [k].Time.ToLocalTime ();
+				DateTime date = rolls [k].Time;
 				
 				string header = String.Format ("{0} ({1})",
 					date.ToString("%dd %MMM, %HH:%mm"),
diff -Naur f-spot-0.4.0/src/PhotoStore.cs f-spot-0.4.0-new/src/PhotoStore.cs
--- f-spot-0.4.0/src/PhotoStore.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/PhotoStore.cs	2007-09-17 20:50:21.000000000 +1200
@@ -526,7 +526,6 @@
 				FSpot.JpegFile jimg = img as FSpot.JpegFile;
 			
 				jimg.SetDescription (this.Description);
-				jimg.SetDateTimeOriginal (this.Time.ToLocalTime ());
 				jimg.SetXmp (UpdateXmp (this, jimg.Header.GetXmp ()));
 
 				jimg.SaveMetaData (path);
@@ -1277,7 +1276,7 @@
 	static void Dump (Photo photo)
 	{
 		Console.WriteLine ("\t[{0}] {1}", photo.Id, photo.Path);
-		Console.WriteLine ("\t{0}", photo.Time.ToLocalTime ());
+		Console.WriteLine ("\t{0}", photo.Time);
 
 		if (photo.Description != String.Empty)
 			Console.WriteLine ("\t{0}", photo.Description);
diff -Naur f-spot-0.4.0/src/TimeDialog.cs f-spot-0.4.0-new/src/TimeDialog.cs
--- f-spot-0.4.0/src/TimeDialog.cs	2007-08-02 07:09:06.000000000 +1200
+++ f-spot-0.4.0-new/src/TimeDialog.cs	2007-09-17 20:48:48.000000000 +1200
@@ -140,7 +140,7 @@
 				IBrowsableItem item = Item.Current;
 				
 				name_label.Text = item.Name;;
-				old_label.Text = item.Time.ToLocalTime ().ToString ();
+				old_label.Text = item.Time.ToString ();
 				
 				int i = collection.Count > 0 ? Item.Index + 1: 0;
 				// This indicates the current photo is photo {0} of {1} out of photos
