Postbox Extension: different fixes