diff --git a/sgx-bwmsgsv2.rb b/sgx-bwmsgsv2.rb
index 0525dd565a712ab869f7bbe6e4d3aaaf3a4a1af8..bfee7176214aba2b04236129e4a88394525055b1 100755
--- a/sgx-bwmsgsv2.rb
+++ b/sgx-bwmsgsv2.rb
@@ -898,13 +898,19 @@ class WebhookHandler < Goliath::API
 					addr1['jid'] = bare_jid
 					addrs.add_child(addr1)
 
-					# TODO: actually do N, instead of just 1
-					addrn = Nokogiri::XML::Node.new(
-						'address', msg.document)
-					addrn['type'] = 'to'
-					addrn['uri'] = "sms:#{jparams['to'][1]}"
-					addrn['delivered'] = 'true'
-					addrs.add_child(addrn)
+					jparams['to'].each do |receiver|
+						if receiver == users_num
+							# already there in addr1
+							next
+						end
+
+						addrn = Nokogiri::XML::Node.new(
+							'address', msg.document)
+						addrn['type'] = 'to'
+						addrn['uri'] = "sms:#{receiver}"
+						addrn['delivered'] = 'true'
+						addrs.add_child(addrn)
+					end
 
 					msg.add_child(addrs)