Most Intuitive way to organize images into albums?

Question

I need to create a interface wherein a user can quickly categorize few of his photos into albums.

Constraints

1. 1 photo can be a part of multiple albums.
2. Atmost there are 15-20 photos and 5-6 albums.
3. Each photo is detailed, so a full view is required before they can be categorized into any album (i.e. thumbnails don't provide enough feedback)

What is the most intuitive interaction that would fit the above case, so that the user doesn't have to keep switching between screens?

Rudimentary solution

Here's a drag n drop solution I thought of :-

^{download bmml source – Wireframes created with Balsamiq Mockups}

Problem

The problem with the above workflow is for categorizing any image user has to perform 3 steps:

1. Click full view to view image in a lightbox.
2. Close lightbox.
3. Move one image to album via drag drop (repeat)

This becomes very tedious if there are many images.

Answer 1

Here is one solution, that could be added to the functionality you have outlined.

When the user opens the image in a lightbox, have a series of buttons below the image representing each album. The user can then click the button to add the open image to that specific album, or click again to remove it, like a check box. Double clicking could both add the image to the album, and return the user to the thumbnail view, increasing the efficiency of the workflow.

You could also display a tooltip of what albums an image belongs to when you mouse-over the thumbnail.