compose: prevent trailing spaces on empty headers

compose: prevent trailing spaces on empty headers #681