diff --git a/src/net/smtp/SMTPResponse.cpp b/src/net/smtp/SMTPResponse.cpp
index c1608b23..c39774b1 100644
--- a/src/net/smtp/SMTPResponse.cpp
+++ b/src/net/smtp/SMTPResponse.cpp
@@ -108,6 +108,9 @@ const string SMTPResponse::readResponseLine()
 {
 	string currentBuffer = m_responseBuffer;
 
+	if (m_timeoutHandler)
+		m_timeoutHandler->resetTimeOut();
+
 	while (true)
 	{
 		// Get a line from the response buffer
diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp
index 1a6913dd..da812952 100644
--- a/vmime/net/imap/IMAPParser.hpp
+++ b/vmime/net/imap/IMAPParser.hpp
@@ -5075,6 +5075,9 @@ public:
 		ref <timeoutHandler> toh = m_timeoutHandler.acquire();
 		ref <socket> sok = m_socket.acquire();
 
+		if (toh)
+			toh->resetTimeOut();
+
 		while (receiveBuffer.empty())
 		{
 			// Check whether the time-out delay is elapsed