Vantage 2006 Door mirror problems

[moncontourist]

I only found out yesterday that by pressing both mirror buttons together they fold in... And now it has created a problem!
The passenger side will not lock in the correct position either folded in or in the driving position. It wants to stay about 30 degrees away from where it should be. It clicks into a position but it is not the correct position.....
And if that was not bad enough, I can only adjust the mirrors when they are in the folded in position not when they are in the driving position!
I am quite prepared to remove the passenger mirror to see if anything has "moved" but no idea how to get them to adjust when back in the driving position
HELP!

[moncontourist]

Thank you
To remove the mirror to lubricate, do I just remove the two screws or do I need to remove the casing and/or the mirror glass ?

[moncontourist]

Thanks for your help I will give it a go.
I am at a disadvantage as I live in France and no AM service centers near by, the earest is 5 hours drive !
I am bringing it over for a service in April but want to fix it before then.
I bought the car in UK last August and love it to bits but concerned about any ongoing issues. Getting parts delivered from UK is ok and I am friendly with the local Citroen garage who are happy to do simple jobs like changing brake pads etc. but obviously nothing too technical!