Buckets should be able to pick flowing liquids

Similar to real life, when a someone fills a bucket upon a flowing river, so should Minecraft allow players to fill theirs buckets by right-clicking flowing liquids (like water and lava).

I see this being implemented one of two ways:
1) a bucket filled by a flowing liquid, should deplete the source slightly - after two or three buckets, the source should become dry; this could be coupled with the removal of the infinite water source (although, I do not think this would be completely desirable)
2) a bucket filled by a flowing liquid, should contain a non-source block version of that liquid; meaning that, once placed, the liquid would flow and spread, but since it is a source block, it would disappear as if the source block was removed

Of the two possible implementations, I most certainly would prefer the second, since it does not break the balance of the game and allows for a new mechanic of spreading liquids.

It goes without saying that the team may very well scrap any of the suggestions and come up with their own ideas.