Increased pin messages limit in DMs

A small feature im sure in terms of priority but i would love to see a higher limit on the amount of messages that can be pinned, specially within a DM. Me and my friend has reached the limit a few times but we still wanna pit few important things (along with our memes too >.>)

Bonus thing regarding pins, in terms of pins for servers. Being able to basically pin a already pinned message to the top would be useful for making sure messages such as rules, important messages or FAQ would always stay on top when a user click on the pinned list, instead of it being pushed down towards the bottom wich i would assume not many new people scroll down through the entire pinned list when joining a new server.