diff --git a/src/sys/mpi/message.c b/src/sys/mpi/message.c
index 0338401..728d3ee 100644
--- a/src/sys/mpi/message.c
+++ b/src/sys/mpi/message.c
@@ -200,6 +200,11 @@
     return(-1);
     }
 
+  if (mbox->pid != _current->id) {
+    spinUnlock(&mpiSpinLock);
+    return(-1);
+    }
+
   msg->type = mbox->msg->type;
   kmemcpy(msg->data,mbox->msg->data,MESSAGE_LENGTH);
 
@@ -228,6 +233,10 @@
 
   for (mbox = mboxList;mbox;mbox=mbox->next) {
     if (!kstrcmp(mbox->name,name)) {
+      if (mbox->pid != _current->id) {
+        spinUnlock(&mpiSpinLock);
+        return(-1);
+        }
       mbox->prev->next = mbox->next;
       mbox->next->prev = mbox->prev;
       kfree(mbox);
@@ -241,6 +250,9 @@
 
 /***
  $Log$
+ Revision 1.7  2004/05/25 22:25:39  reddawg
+ Typo Fix
+
  Revision 1.6  2004/05/25 18:32:02  reddawg
  Made MESSAGE_LENGTH define instead of hard coded message size