[#61223320] change email poke layout
[#61223320] fix conflict