extra/thunderbird: annotate changes