I don't know if this is still an issue for you, and it sounds as though you are sorted, but if at some point you decide to explore other avenues, I find that Google Picasa works really well. In case you aren't familiar with it, here's a
wiki page, and a snip from it below.

QUOTE
It allows users with a Google account to store and share photos with an initial free storage offering of 15 GB, that is shared with Gmail and Google Drive. Storage is unlimited for photos of resolution less than 2048x2048 pixels for Google+ users, and for photos of resolution less than 800x800 for everyone else. Videos shorter than 15 minutes also don't count towards the limit. After the limit is reached, photos are automatically resized.
This post has been edited by ArtemisNoir2: Mar 26 2015, 07:51 AM