diff --git a/ChangeLog b/ChangeLog
index 236c76be0..4bcab46d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-02-07  Yavor Doganov  <yavor@gnu.org>
+
+	* Source/NSPortMessage.m (sendBeforeDate:): Invoke
+	-sendBeforeDate:msgid:components:from:reserved: so that the value
+	of _msgid is taken into account.
+	(initWithSendPort:receivePort:components:): Set _msgid to 0.
+
 2018-02-06  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Headers/Foundation/NSException.h:
diff --git a/Source/NSPortMessage.m b/Source/NSPortMessage.m
index 679075875..b407cc48f 100644
--- a/Source/NSPortMessage.m
+++ b/Source/NSPortMessage.m
@@ -71,6 +71,7 @@
   self = [super init];
   if (self != nil)
     {
+      _msgid = 0;
       _send = RETAIN(aPort);
       _recv = RETAIN(anotherPort);
       _components = [[NSMutableArray allocWithZone: [self zone]]
@@ -97,6 +98,7 @@
 - (BOOL) sendBeforeDate: (NSDate*)when
 {
   return [_send sendBeforeDate: when
+			 msgid: _msgid
 		    components: _components
 			  from: _recv
 		      reserved: 0];