Currently, this function goes to a lot of trouble to concatenate a complicated regexp to find metadata and drawers, and then doesn't use it. As it stands, if you put point in a headline that has a property drawer and then call =(org-end-of-meta-data-and-drawers)=, point moves to the *beginning* of the property drawer -- obviously not what you want. Eric