Door catch problem on 964

[iamthestig]

The passenger door (on a LHD) works a bit intermittently. It always holds shut but sometimes not close to the body and then rattles. It seems to close better from the outside.

Any ideas on where get a new door mechanism for a reasonable price? Or could it just be a case of tightening or lubricating something behind the door panel?