Added feature #12187: Added more usage of flashmessages to EM