diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 8cab93de7c8..4d8b754cdc2 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.137 2010/04/30 14:40:58 pea Exp $
+# $OpenBSD: Makefile,v 1.138 2010/05/02 22:42:44 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -11,7 +11,7 @@ V_SIEVE=	0.1.16
 V_MANAGESIEVE=	0.11.11
 
 PKGNAME=	dovecot-${V_DOVECOT}
-PKGNAME-server=	dovecot-${V_DOVECOT}p3
+PKGNAME-server=	dovecot-${V_DOVECOT}p4
 FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}p0v0
 FULLPKGPATH-sieve= ${PKGPATH},-sieve
 
diff --git a/mail/dovecot/patches/patch-src_imap_imap-fetch-body_c b/mail/dovecot/patches/patch-src_imap_imap-fetch-body_c
new file mode 100644
index 00000000000..6422d31cb50
--- /dev/null
+++ b/mail/dovecot/patches/patch-src_imap_imap-fetch-body_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_imap_imap-fetch-body_c,v 1.1 2010/05/02 22:42:44 sthen Exp $
+--- src/imap/imap-fetch-body.c.orig	Sun May  2 16:56:51 2010
++++ src/imap/imap-fetch-body.c	Sun May  2 16:57:42 2010
+@@ -274,6 +274,8 @@ static int fetch_stream_send_direct(struct imap_fetch_
+ 				"%"PRIuUOFF_T" vs %"PRIuUOFF_T,
+ 				ctx->cur_name, mailbox_get_name(ctx->mail->box),
+ 				ctx->mail->uid, ctx->cur_offset, ctx->cur_size);
++			mail_set_cache_corrupted(ctx->mail,
++						 ctx->cur_size_field);
+ 			client_disconnect(ctx->client, "FETCH failed");
+ 			return -1;
+ 		}