--- a/src/lib-storage/index/index-search.c	Tue Sep 10 06:26:05 2002 +0300
+++ b/src/lib-storage/index/index-search.c	Tue Sep 10 06:32:42 2002 +0300
@@ -488,13 +488,16 @@
 
 		ctx.msg = io_buffer_get_data(inbuf, &size);
 		if (size > 0) {
-			ctx.size = max_size < size ? max_size : size;
-			max_size -= ctx.size;
+			if (size > max_size)
+				size = max_size;
 
+			ctx.size = size;
 			mail_search_args_foreach(args, search_func, &ctx);
 
-			if (ctx.max_searchword_len < size)
+			if (ctx.max_searchword_len < size && size < max_size)
 				size -= ctx.max_searchword_len-1;
+
+			max_size -= size;
 			io_buffer_skip(inbuf, size);
 		}
 	}