Smoking in Star Trek

I just noticed that in Star Trek II, there's a no-smoking sign on the Enterprise bridge. (Or, at least, on the Kobayashi Maru simulator.)

This is amusing enough, but am I correct that Martia (Iman) in The Undiscovered Country is the only person ever to smoke on screen in Star Trek?

Update: I should have known there would be a Memory Alpha entry about this. And no, St. John Talbot in The Final Frontier also smoked. (As did a lot of characters in fake Star Trek shows like Next Generation.)