Thank you for the enhancement of this featue.
Could you also take to account self message perform by the system with same principle ?
If you put system from model element at the beginning of the line, it creates a self message like this :
Thanks for your response