Ok, so I was wrong, but it still not good. The reason is that it'll always add the header, while it should only add the header if the message is not encrypted in the first place.