Moved to common message picker