diff --git a/postfix/HISTORY b/postfix/HISTORY
index bce6a9d99..acd7273b6 100644
--- a/postfix/HISTORY
+++ b/postfix/HISTORY
@@ -13543,9 +13543,12 @@ Apologies for any names omitted.
 	build on a 2.6 kernel. And that two weeks after the workaround
 	had been posted to the mailing list. File: makedefs.
 
-	Bugfix: mailbox_transport nixed the recipient file offset
-	for both local(8) and the delegated transport, instead of
-	just nixing it only for local(8). File: local/mailbox.c.
+	Workaround: local(8) nixed the recipient file offset for
+	delegated transports. This broke delegation via
+	mailbox_transport(_maps) and fallback_transport(_maps) to
+	the error(8) transport. Unfortunately it is not possible
+	to nix the file offset for local(8) only.  Files:
+	local/mailbox.c, local/unknown.c.
 
 Wish list:
 
diff --git a/postfix/src/global/mail_version.h b/postfix/src/global/mail_version.h
index be376737a..6560b7a15 100644
--- a/postfix/src/global/mail_version.h
+++ b/postfix/src/global/mail_version.h
@@ -20,7 +20,7 @@
   * Patches change both the patchlevel and the release date. Snapshots have no
   * patchlevel; they change the release date only.
   */
-#define MAIL_RELEASE_DATE	"20070514"
+#define MAIL_RELEASE_DATE	"20070515"
 #define MAIL_VERSION_NUMBER	"2.5"
 
 #ifdef SNAPSHOT
diff --git a/postfix/src/local/mailbox.c b/postfix/src/local/mailbox.c
index d29591fef..900075b02 100644
--- a/postfix/src/local/mailbox.c
+++ b/postfix/src/local/mailbox.c
@@ -274,7 +274,6 @@ int     deliver_mailbox(LOCAL_STATE state, USER_ATTR usr_attr, int *statusp)
     if (*var_mbox_transp_maps
 	&& (map_transport = maps_find(transp_maps, state.msg_attr.user,
 				      DICT_FLAG_NONE)) != 0) {
-	state.msg_attr.rcpt.offset = -1L;
 	*statusp = deliver_pass(MAIL_CLASS_PRIVATE, map_transport,
 				state.request, &state.msg_attr.rcpt);
 	return (YES);
@@ -282,7 +281,6 @@ int     deliver_mailbox(LOCAL_STATE state, USER_ATTR usr_attr, int *statusp)
     if (*var_mailbox_transport) {
 	*statusp = deliver_pass(MAIL_CLASS_PRIVATE, var_mailbox_transport,
 				state.request, &state.msg_attr.rcpt);
-	state.msg_attr.rcpt.offset = -1L;
 	return (YES);
     }
 
diff --git a/postfix/src/local/unknown.c b/postfix/src/local/unknown.c
index cc80acfa6..8ae8f0b12 100644
--- a/postfix/src/local/unknown.c
+++ b/postfix/src/local/unknown.c
@@ -116,7 +116,6 @@ int     deliver_unknown(LOCAL_STATE state, USER_ATTR usr_attr)
 			     state.request, &state.msg_attr.rcpt));
     }
     if (*var_fallback_transport) {
-	state.msg_attr.rcpt.offset = -1L;
 	return (deliver_pass(MAIL_CLASS_PRIVATE, var_fallback_transport,
 			     state.request, &state.msg_attr.rcpt));
     }