diff --git a/src/drv_maildir.c b/src/drv_maildir.c
index e5235c1..54cadc1 100644
--- a/src/drv_maildir.c
+++ b/src/drv_maildir.c
@@ -640,7 +640,7 @@ maildir_scan( maildir_store_t *ctx, msglist_t *msglist )
 				if (u)
 					ml = u - entry->base;
 				else
-					ru = "", ml = INT_MAX;
+					ru = "", ml = sizeof(buf);
 				fnl = nfsnprintf( buf + bl, sizeof(buf) - bl, "%s/%.*s,U=%d%s", subdirs[entry->recent], ml, entry->base, uid, ru ) + 1 - 4;
 				memcpy( nbuf, buf, bl + 4 );
 				nfsnprintf( nbuf + bl + 4, sizeof(nbuf) - bl - 4, "%s", entry->base );
diff --git a/src/mdconvert.c b/src/mdconvert.c
index f2c60a1..12ff788 100644
--- a/src/mdconvert.c
+++ b/src/mdconvert.c
@@ -154,7 +154,7 @@ convert( const char *box, int altmap )
 			if (u)
 				ml = u - e->d_name;
 			else
-				ru = "", ml = INT_MAX;
+				ru = "", ml = sizeof(buf);
 			if (altmap) {
 				if (!p)
 					continue;