found this on a sprint mogul forum, and just tested it works with diamonds too
you have to use a registry editor to make the change...
to set album being default viewer go to HKLM - software - htc - htcalbum - default viewer set to "1"
hope that helps.