Emotional Eating

Before my surgery I was an emotional eater. I know that having the surgery doesn't cure that and I find myself still doing that. When I'm bored is the worst time for me. Also late at night. I need to find other activities to do instead of eat. During the day I can go for a walk or go outside but when its dark out its not safe for me to be outside. I am working on this with my therapist but still find myself returning to old habits. Do any of you have this problem? If so how did/do you deal with it? I try to drink water or diet tea instead of eating but end up still eating. I know this is the reason I'm not losing as good as I should. I'm still losing but not as much as I could. Any help would be greatly appreciated.