Update version to 2.5.4 and release
Mail folder extentions
Merge commit '305839c6b9d01d6f05e7a294b3417a97e7623ee6'