improved reply/draft buttons handling