Draft: make it better

Can't show this merge request because the target branch main is missing from project rek/tmail. Close this merge request or update the target branch.