--- a/src/lib-imap/imap-bodystructure.c	Mon Oct 24 01:45:18 2016 +0200
+++ b/src/lib-imap/imap-bodystructure.c	Wed Oct 26 23:44:47 2016 +0200
@@ -16,6 +16,10 @@
 #define EMPTY_BODYSTRUCTURE "(\"text\" \"plain\" " \
 	"(\"charset\" \""MESSAGE_PART_DEFAULT_CHARSET"\") NIL NIL \"7bit\" 0 0)"
 
+/*
+ * IMAP BODY/BODYSTRUCTURE write
+ */
+
 static void
 params_write(const struct message_part_param *params,
 	unsigned int params_count, string_t *str,
@@ -224,6 +228,10 @@
 		part_write_body(part, dest, extended);
 }
 
+/*
+ * IMAP BODYSTRUCTURE parsing
+ */
+
 static int
 imap_bodystructure_strlist_parse(const struct imap_arg *arg,
 	pool_t pool, const char *const **list_r)
@@ -635,6 +643,10 @@
 		pool, &parts, error_r);
 }
 
+/*
+ * IMAP BODYSTRUCTURE to BODY conversion
+ */
+
 static bool str_append_nstring(string_t *str, const struct imap_arg *arg)
 {
 	const char *cstr;

--- a/src/lib-imap/imap-envelope.c	Mon Oct 24 01:45:18 2016 +0200
+++ b/src/lib-imap/imap-envelope.c	Wed Oct 26 23:44:47 2016 +0200
@@ -10,6 +10,10 @@
 #include "imap-envelope.h"
 #include "imap-quote.h"
 
+/*
+ * Envelope write
+ */
+
 static void imap_write_address(string_t *str, struct message_address *addr)
 {
 	if (addr == NULL) {
@@ -80,6 +84,10 @@
 	imap_append_nstring(str, data->message_id);
 }
 
+/*
+ * ENVELOPE parsing
+ */
+
 static bool
 imap_envelope_parse_address(const struct imap_arg *arg,
 	pool_t pool, struct message_address **addr_r)