[mr2643] Calendar: small rework