Retry of #36: Change Draft-mark handling