Sort out right margins quite nicely, using fci-mode (fill-column-indicator) as well as whitespace-mode.