diff --git a/scripts/base/frameworks/notice/extend-email/hostnames.bro b/scripts/base/frameworks/notice/extend-email/hostnames.bro
index 9e0f4c612b..89e3a3997e 100644
--- a/scripts/base/frameworks/notice/extend-email/hostnames.bro
+++ b/scripts/base/frameworks/notice/extend-email/hostnames.bro
@@ -25,7 +25,7 @@ event Notice::notice(n: Notice::Info) &priority=10
 			n$email_body_sections[|n$email_body_sections|] = output;
 			delete n$email_delay_tokens["hostnames-src"];
 			}
-		timeout max_email_delay+5secs { }
+		timeout max_email_delay { }
 		}
 	if ( n?$dst )
 		{
@@ -36,6 +36,6 @@ event Notice::notice(n: Notice::Info) &priority=10
 			n$email_body_sections[|n$email_body_sections|] = output;
 			delete n$email_delay_tokens["hostnames-dst"];
 			}
-		timeout max_email_delay+5secs { }
+		timeout max_email_delay { }
 		}
 	}
diff --git a/scripts/base/frameworks/notice/main.bro b/scripts/base/frameworks/notice/main.bro
index 41a44774bc..ec2f0133b5 100644
--- a/scripts/base/frameworks/notice/main.bro
+++ b/scripts/base/frameworks/notice/main.bro
@@ -369,7 +369,7 @@ function email_notice_to(n: Notice::Info, dest: string, extend: bool)
 		{
 		if ( |n$email_delay_tokens| > 0 )
 			{
-			# If we still are within the max_email_delay, keep delaying
+			# If we still are within the max_email_delay, keep delaying.
 			if ( n$ts + max_email_delay > network_time() )
 				schedule 1sec { delay_sending_email(n, dest, extend) };
 			else