diff -u evolution-data-server-2.24.5/debian/changelog evolution-data-server-2.24.5/debian/changelog
--- evolution-data-server-2.24.5/debian/changelog
+++ evolution-data-server-2.24.5/debian/changelog
@@ -1,3 +1,10 @@
+evolution-data-server (2.24.5-5) UNRELEASED; urgency=low
+
+  * When we fail to open/write the offline journal, include the actual
+    filename in the error message.
+
+ -- Julien Cristau <jcristau@debian.org>  Sat, 18 Apr 2009 18:02:56 +0200
+
 evolution-data-server (2.24.5-4) unstable; urgency=low
 
   * Fix -dbg package section to match the override.
only in patch2:
unchanged:
--- evolution-data-server-2.24.5.orig/camel/camel-offline-journal.c
+++ evolution-data-server-2.24.5/camel/camel-offline-journal.c
@@ -161,8 +161,8 @@
 	
 	if ((fd = g_open (journal->filename, O_CREAT | O_TRUNC | O_WRONLY | O_BINARY, 0666)) == -1) {
 		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Cannot write offline journal for folder '%s': %s"),
-				      journal->folder->full_name, g_strerror (errno));
+				      _("Cannot open offline journal for folder '%s' (%s): %s"),
+				      journal->folder->full_name, journal->filename, g_strerror (errno));
 		return -1;
 	}
 	
@@ -184,8 +184,8 @@
  exception:
 	
 	camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-			      _("Cannot write offline journal for folder '%s': %s"),
-			      journal->folder->full_name, g_strerror (errno));
+			      _("Cannot write offline journal for folder '%s' (%s): %s"),
+			      journal->folder->full_name, journal->filename, g_strerror (errno));
 	
 	fclose (fp);