[mk] move reply/forward buttons up, other small changes