fixed incoming mail with images
Merge branch 'feature_incomingmail' into NewInfraBranch