diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp b/src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp
index c1f75e5e86..4c0faeef2f 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/SMTP.cpp
@@ -908,15 +908,14 @@ SMTPProtocol::Send(const char* to, const char* from, BPositionIO *message)
 			if (amountUnread <= 0) { // No more data, all we have is in the buffer.
 				if (bufferLen > 0) {
 #ifdef USE_SSL
-					if (use_ssl) {
-						SSL_write(ssl,data,bufferLen);
-					} else {
-						send (fSocket,data, bufferLen,0);
-					}
+					if (use_ssl)
+						SSL_write(ssl, data, bufferLen);
+					else
+						send(fSocket, data, bufferLen, 0);
 #else
-					send (fSocket,data, bufferLen,0);
+					send(fSocket, data, bufferLen, 0);
 #endif
-					ReportProgress (bufferLen,0);
+					ReportProgress(bufferLen, 0);
 					if (bufferLen >= 2)
 						messageEndedWithCRLF = (data[bufferLen-2] == '\r' &&
 							data[bufferLen-1] == '\n');
@@ -929,17 +928,17 @@ SMTPProtocol::Send(const char* to, const char* from, BPositionIO *message)
 			if (bufferLen > 3) {
 #ifdef USE_SSL
 				if (use_ssl) {
-					if (SSL_write(ssl,data,bufferLen - 3) < 0)
+					if (SSL_write(ssl, data, bufferLen - 3) < 0)
 						break;
 				} else {
-					if (send (fSocket,data, bufferLen - 3,0) < 0)
+					if (send(fSocket, data, bufferLen - 3, 0) < 0)
 						break; // Stop when an error happens.
 				}
 #else
-				if (send (fSocket,data, bufferLen - 3,0) < 0)
+				if (send(fSocket, data, bufferLen - 3, 0) < 0)
 					break; // Stop when an error happens.
 #endif
-				ReportProgress (bufferLen - 3,0);
+				ReportProgress(bufferLen - 3, 0);
 				memmove (data, data + bufferLen - 3, 3);
 				bufferLen = 3;
 			}