--- fiasco-1.0/l4/kernel/fiasco/src/kern/ia32/thread-msg-ia32.cpp	Wed Mar 26 10:13:24 2003
+++ fiasco-patches/l4/kernel/fiasco/src/kern/ia32/thread-msg-ia32.cpp	Fri Apr 25 10:16:24 2003
@@ -133,8 +133,9 @@
       //data behind it (see small address spaces)
       snd_descr = (message_header*)regs->snd_desc().msg();
   
-      if (_target_desc.msg() == 0) // receiver expects short message
+      if ((_target_desc.msg() == 0) || _target_desc.rmap())
         {
+	  // receiver expects short message
           rcv_header = 0;
         }
       else