|Best to just let these two work things out on their own.|
I had always assumed that it was the restoration of the earth to its celestial state that would cause the animals to return to their pre-Fall behavior. I came across an interesting article in the August 1972 Ensign, a section of which reads:
"During the Zion’s Camp expedition in the summer of 1834, an incident occurred that allowed a practical application of concern for animal life. As related by the Prophet Joseph Smith in his history:
The notion that it is mankind's responsibility to teach the animals how to return to peaceful behavior seems at odds with Milton's representation. Joseph Smith's teachings seem to place a lot more responsibility on the individual, and less on the grace and power of God. It also opens up the possibility that the evils of mankind taught animals how to be ferocious in the first place.
For the ultimate example of discord between both man and beast, I present the always popular "Guy on a Buffalo" for your viewing pleasure. Feel free to watch all 4 episodes.
A link to the article: http://www.lds.org/ensign/1972/08/the-gospel-and-animals