The company is currently working on a patch to the chipset's control software. If this does not help, Samsung plans to use heat-pipes to improve heat dissipation.
http://www.notebookcheck.net/Samsung-faces-Snapdragon-820-overheating-issues.153038.0.html