diff --git a/src/doveadm/dsync/dsync-ibc-stream.c b/src/doveadm/dsync/dsync-ibc-stream.c
index 526f9d5bf5..5ef077a236 100644
--- a/src/doveadm/dsync/dsync-ibc-stream.c
+++ b/src/doveadm/dsync/dsync-ibc-stream.c
@@ -235,8 +235,7 @@ static int dsync_ibc_stream_send_value_stream(struct dsync_ibc_stream *ibc)
 	size_t i, size;
 	int ret;
 
-	while ((ret = i_stream_read_data(ibc->value_output,
-					 &data, &size, 0)) > 0) {
+	while ((ret = i_stream_read_more(ibc->value_output, &data, &size)) > 0) {
 		add = '\0';
 		for (i = 0; i < size; i++) {
 			if (data[i] == '.' &&
diff --git a/src/lib-compression/istream-lz4.c b/src/lib-compression/istream-lz4.c
index 67efaaa02d..77767112d5 100644
--- a/src/lib-compression/istream-lz4.c
+++ b/src/lib-compression/istream-lz4.c
@@ -130,8 +130,7 @@ static ssize_t i_stream_lz4_read(struct istream_private *stream)
 
 	/* read the whole compressed chunk into memory */
 	while (zstream->chunk_left > 0 &&
-	       (ret = i_stream_read_data(zstream->istream.parent,
-					 &data, &size, 0)) > 0) {
+	       (ret = i_stream_read_more(zstream->istream.parent, &data, &size)) > 0) {
 		if (size > zstream->chunk_left)
 			size = zstream->chunk_left;
 		buffer_append(zstream->chunk_buf, data, size);
diff --git a/src/lib-http/http-header-parser.c b/src/lib-http/http-header-parser.c
index 88caf63778..0c1a9cda63 100644
--- a/src/lib-http/http-header-parser.c
+++ b/src/lib-http/http-header-parser.c
@@ -296,8 +296,7 @@ int http_header_parse_next_field(struct http_header_parser *parser,
 
 	*error_r = NULL;
 
-	while ((ret=i_stream_read_data
-		(parser->input, &parser->begin, &size, 0)) > 0) {
+	while ((ret=i_stream_read_more(parser->input, &parser->begin, &size)) > 0) {
 
 		/* check header size limits */
 		if (parser->size >= max_size) {
diff --git a/src/lib-http/http-transfer-chunked.c b/src/lib-http/http-transfer-chunked.c
index 935f53b168..4d3bd625be 100644
--- a/src/lib-http/http-transfer-chunked.c
+++ b/src/lib-http/http-transfer-chunked.c
@@ -311,8 +311,7 @@ static int http_transfer_chunked_parse_next(
 	size_t size;
 	int ret;
 
-	while ((ret=i_stream_read_data
-		(input, &tcstream->begin, &size, 0)) > 0) {
+	while ((ret=i_stream_read_more(input, &tcstream->begin, &size)) > 0) {
 		tcstream->cur = tcstream->begin;
 		tcstream->end = tcstream->cur + size;
 
diff --git a/src/lib-lda/lmtp-client.c b/src/lib-lda/lmtp-client.c
index e47e0e8b6e..5c91e7d72c 100644
--- a/src/lib-lda/lmtp-client.c
+++ b/src/lib-lda/lmtp-client.c
@@ -326,8 +326,7 @@ static int lmtp_client_send_data(struct lmtp_client *client)
 	if (client->output_finished)
 		return 0;
 
-	while ((ret = i_stream_read_data(client->data_input,
-					 &data, &size, 0)) > 0) {
+	while ((ret = i_stream_read_more(client->data_input, &data, &size)) > 0) {
 		add = '\0';
 		for (i = 0; i < size; i++) {
 			if (data[i] == '\n') {