--- fiasco-1.0/l4/kernel/fiasco/src/kern/ux/thread-msg-ux.cpp	Fri Feb 21 00:32:20 2003
+++ fiasco-patches/l4/kernel/fiasco/src/kern/ux/thread-msg-ux.cpp	Fri Apr 25 12:08:53 2003
@@ -61,7 +61,9 @@
 
   snd_descr = (message_header *) regs->snd_desc().msg();
   rcv_descr = (message_header *) _target_desc.msg();
- 
+      rcv_descr = (message_header *) 
+			(_target_desc.rmap() ? 0 : _target_desc.msg());
+
   // Treat dwords as fpage mappings
   bool send_fpages = regs->snd_desc().map();