Markup branch: ported [3645] plus fixed the display of attachments.
Authored by: cboos 2006-08-24
Parent: [r3645]
Child: [r3647]