Internal walls, crumbling mortar. Suggestions please!

[Gypsy07]

1890s building, internal renovations progressing, all plaster removed from walls. Brick walls underneath, mortar dry and loose and crumbling out. Two of the walls are load bearing but are only supporting a roof (I'm in the top floor & attic) and one of them is non load bearing. I've been advised to rake the joints out an inch or so before replastering, to stabilise the brickwork. Elsewhere in the property the plaster/mortar has degraded to the point that bits of walls have suffered minor collapses and have been rebuilt, and I want to make sure this isn't goping to happen here after I've gone to the bother of replastering.


So... Can I just seal the brickwork and remaining mortar with PVA and then stuff the gaps with bonding while I'm replastering, or should I be doing a 'proper' repointing job with cement before I set about plastering the brickwork?

[welsh brickie]

repoint the brickwork first then replaster