Prevent widening of window

On my MacBook, if I move a Safari window, or Mail message, to the right side of the screen, it becomes the full width of the screen. I know that if I do fn-control-r I get back to the previous window size, but sometimes it takes 2 or 3 times to stay at that size. Is there a way to prevent the system from imposing full width?