Merge pull request #2828 from brunoais/ticket/12930

[ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
Merge branch 'develop-ascraeus' into develop