This was a big problem for me, until one day I sat down and cleaned my inbox. Basically moving the correct things to the correct place and now I don't face this issue.