Finally fixed message compose