diff --git a/src/lib-imap/imap-bodystructure.c b/src/lib-imap/imap-bodystructure.c
index 2178b0c94f..84dc8cee0f 100644
--- a/src/lib-imap/imap-bodystructure.c
+++ b/src/lib-imap/imap-bodystructure.c
@@ -196,7 +196,7 @@ static void part_write_body(const struct message_part *part,
 		child_data = part->children->data;
 
 		str_append(str, " (");
-		imap_envelope_write_part_data(child_data->envelope, str);
+		imap_envelope_write(child_data->envelope, str);
 		str_append(str, ") ");
 
 		part_write_bodystructure_siblings(part->children, str, extended);
diff --git a/src/lib-imap/imap-envelope.c b/src/lib-imap/imap-envelope.c
index a1067eb2f1..f643e815ed 100644
--- a/src/lib-imap/imap-envelope.c
+++ b/src/lib-imap/imap-envelope.c
@@ -39,7 +39,7 @@ static void imap_write_address(string_t *str, struct message_address *addr)
 	str_append_c(str, ')');
 }
 
-void imap_envelope_write_part_data(struct message_part_envelope_data *data,
+void imap_envelope_write(struct message_part_envelope *data,
 				   string_t *str)
 {
 #define NVL(str, nullstr) ((str) != NULL ? (str) : (nullstr))
@@ -147,12 +147,12 @@ imap_envelope_parse_addresses(const struct imap_arg *arg,
 }
 
 bool imap_envelope_parse_args(const struct imap_arg *args,
-	pool_t pool, struct message_part_envelope_data **envlp_r,
+	pool_t pool, struct message_part_envelope **envlp_r,
 	const char **error_r)
 {
-	struct message_part_envelope_data *envlp;
+	struct message_part_envelope *envlp;
 
-	envlp = p_new(pool, struct message_part_envelope_data, 1);
+	envlp = p_new(pool, struct message_part_envelope, 1);
 
 	if (!imap_arg_get_nstring(args++, &envlp->date)) {
 		*error_r = "Invalid date field";
diff --git a/src/lib-imap/imap-envelope.h b/src/lib-imap/imap-envelope.h
index 8d505dda62..4f9425ea55 100644
--- a/src/lib-imap/imap-envelope.h
+++ b/src/lib-imap/imap-envelope.h
@@ -2,15 +2,15 @@
 #define IMAP_ENVELOPE_H
 
 struct imap_arg;
-struct message_part_envelope_data;
+struct message_part_envelope;
 
 /* Write envelope to given string */
-void imap_envelope_write_part_data(struct message_part_envelope_data *data,
+void imap_envelope_write(struct message_part_envelope *data,
 				   string_t *str);
 
 /* Parse envelope from arguments */
 bool imap_envelope_parse_args(const struct imap_arg *args,
-	pool_t pool, struct message_part_envelope_data **envlp_r,
+	pool_t pool, struct message_part_envelope **envlp_r,
 	const char **error_r);
 
 #endif
diff --git a/src/lib-mail/message-part-data.c b/src/lib-mail/message-part-data.c
index 363fc2e4f3..17c6f0a94a 100644
--- a/src/lib-mail/message-part-data.c
+++ b/src/lib-mail/message-part-data.c
@@ -141,16 +141,16 @@ envelope_get_field(const char *name)
 }
 
 void message_part_envelope_parse_from_header(pool_t pool,
-	struct message_part_envelope_data **data,
+	struct message_part_envelope **data,
 	struct message_header_line *hdr)
 {
-	struct message_part_envelope_data *d;
+	struct message_part_envelope *d;
 	enum envelope_field field;
 	struct message_address **addr_p;
 	const char **str_p;
 
 	if (*data == NULL) {
-		*data = p_new(pool, struct message_part_envelope_data, 1);
+		*data = p_new(pool, struct message_part_envelope, 1);
 	}
 
 	if (hdr == NULL)
@@ -425,7 +425,7 @@ void message_part_data_parse_from_header(pool_t pool,
 	struct message_header_line *hdr)
 {
 	struct message_part_data *part_data;
-	struct message_part_envelope_data *envelope;
+	struct message_part_envelope *envelope;
 	bool parent_rfc822;
 
 	if (hdr == NULL) {
diff --git a/src/lib-mail/message-part-data.h b/src/lib-mail/message-part-data.h
index 0a581edb53..539d3f4ec8 100644
--- a/src/lib-mail/message-part-data.h
+++ b/src/lib-mail/message-part-data.h
@@ -12,7 +12,7 @@ struct message_part_param {
 	const char *value;
 };
 
-struct message_part_envelope_data {
+struct message_part_envelope {
 	const char *date, *subject;
 	struct message_address *from, *sender, *reply_to;
 	struct message_address *to, *cc, *bcc;
@@ -35,7 +35,7 @@ struct message_part_data {
 	const char *const *content_language;
 	const char *content_location;
 
-	struct message_part_envelope_data *envelope;
+	struct message_part_envelope *envelope;
 };
 
 extern const char *message_part_envelope_headers[];
@@ -55,7 +55,7 @@ bool message_part_data_is_plain_7bit(const struct message_part *part)
 
 /* Update envelope data based from given header field */
 void message_part_envelope_parse_from_header(pool_t pool,
-	struct message_part_envelope_data **_data,
+	struct message_part_envelope **_data,
 	struct message_header_line *hdr);
 
 /* Parse a single header. Note that this modifies part->context. */
diff --git a/src/lib-storage/index/index-mail-headers.c b/src/lib-storage/index/index-mail-headers.c
index 9d856de31c..63e8d12a9c 100644
--- a/src/lib-storage/index/index-mail-headers.c
+++ b/src/lib-storage/index/index-mail-headers.c
@@ -265,7 +265,7 @@ static void index_mail_parse_finish_imap_envelope(struct index_mail *mail)
 	string_t *str;
 
 	str = str_new(mail->mail.data_pool, 256);
-	imap_envelope_write_part_data(mail->data.envelope_data, str);
+	imap_envelope_write(mail->data.envelope_data, str);
 	mail->data.envelope = str_c(str);
 
 	if (mail_cache_field_can_add(_mail->transaction->cache_trans,
diff --git a/src/lib-storage/index/index-mail.h b/src/lib-storage/index/index-mail.h
index ec6c1cdf04..4a63ba25b4 100644
--- a/src/lib-storage/index/index-mail.h
+++ b/src/lib-storage/index/index-mail.h
@@ -85,7 +85,7 @@ struct index_mail_data {
 	struct message_binary_part *bin_parts;
 	const char *envelope, *body, *bodystructure, *guid, *filename;
 	const char *from_envelope, *body_snippet;
-	struct message_part_envelope_data *envelope_data;
+	struct message_part_envelope *envelope_data;
 
 	uint32_t seq;
 	uint32_t cache_flags;