Ellis comes face to face with someone from his past, Zak and Faith share a kiss, and Samson is not happy when he finds out the truth in next week's Emmerdale.
Jessie has an outburst
Jessie gets drunk and is humiliated about resigning from her job.
She is confronted by an accusing Nicola over what happened with Maya.
Feeling backed into a corner, Jessie delivers some angry home truths about the children of the village. Marlon, Ellis and Billy step in.
After escorting Jessie outside, Marlon is horrified as she blames him for her outburst.
Marlon, Jessie, Billy and Ellis walk home as she continues to lash out at Marlon.
A mysterious person watches the group from afar. Who is it?
Ellis's dad arrives
The next day, Ellis goes to meet a potential client. He is shocked when he recognises him as someone from his past...
Later at April's birthday party Ellis tries to tell Jessie about his earlier meeting, but they're suddenly interrupted when they hear a car horn and he storms outside.
Jessie reveals to Marlon the mysterious man is Al, Ellis' dad. Marlon shakes Al's hand.
Jessie doesn't seem pleased to see him. Why has he turned up and will anyone be happy about it?
Faith wants to help Zak
Faith's determined to get Zak smiling again after Lisa's death.
Zak laughs about the old days with her but ultimately feels guilty for having fun without Lisa.
He storms out. Eventually Faith manages to get Zak to talk about their shared history and even manages to get him to smile.
Zak and Faith share a kiss
As they reminisce, Zak and Faith share a brief kiss before the door springs open and the others return home.
Later, Zak feels guilty about the kiss and thinks they should come clean.
The next day Zak wants to talk about it whilst at the Woolpack. Faith suggests they talk in the cellar.
In the cellar Zak and Faith discuss what happened between them, aware of how bad it will look if they're found.
As they continue to talk Bear enters the cellar and they quickly hide.
Whilst in there the fuse box gets soaked in beer when the hose is forced off the barrel. As a result the power goes out upstairs, leaving all eyes on Bear.
Drenched Faith and Zak tumble out of the cellar. Bear sees and is suspicious.
Bear's mortified when Faith reveals how he's illiterate in order to protect her own secret of kissing Zak.
Sam and Lydia tell Samson the truth
Samson is back from his trip. Sam and Lydia tell him about Lydia's past.
They are shocked by his angry reaction. Can they win him round?
Debbie leaves for Scotland
Debbie leaves for Scotland. She says goodbye to her daughter Sarah and the rest of the Dingles.
Can Charity bring herself to say goodbye?
Emmerdale is on Monday to Friday at 7pm with an extra episode at 8pm on Thursday on ITV.
Leave us a comment on our Facebook page @EntertainmentDailyFix and let us know what you think.