- smx_mailbox_t rdv = MSG_mailbox_get_by_alias(alias);
- return !MSG_mailbox_is_empty(rdv) || (rdv->permanent_receiver && xbt_fifo_size(rdv->done_comm_fifo)!=0);
+ smx_mailbox_t mbox = MSG_mailbox_get_by_alias(alias);
+ return !MSG_mailbox_is_empty(mbox) || (mbox->permanent_receiver && !mbox->done_comm_queue->empty());