diff --git a/main.go b/main.go
index 185a977..d83493c 100644
--- a/main.go
+++ b/main.go
@@ -170,6 +170,8 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
 		return nil
 	}
 
+	env.AddReceivedLine(peer)
+
 	if *command != "" {
 		cmdLogger := logger.WithField("command", *command)
 
@@ -196,8 +198,6 @@ func mailHandler(peer smtpd.Peer, env smtpd.Envelope) error {
 
 	logger.Info("delivering mail from peer using smarthost")
 
-	env.AddReceivedLine(peer)
-
 	var sender string
 
 	if *remoteSender == "" {