Scam calls are annoying and potentially dangerous, but the good news for T-Mobile customers is that their carrier is working to fight scammers.

T-Mobile today said that it's improving its Scam ID and Scam Block features. Specifically, T-Mo is adding network-level protections that analyzes network-wide data and better pinpoints and identifies the origin of a call before it reaches your phone. This feature aims to fight neighbor spoofing, a technique where a scammer will spoof or hijack a phone number to match the area code and 3-digit prefix of your phone number to make the incoming call look familiar.

Since launching Scam ID and Scam Block 18 months ago, T-Mobile says that it's tagged more than 6 billion calls as "Scam Likely" and has blocked more than 1 billion scam calls. Both features are included free for T-Mobile postpaid customers and Metro by T-Mobile customers. You can enable Scam Block, which blocks all calls identified as spam, you can do so in your T-Mobile account or by dialing #662#.

Also announced by T-Mobile today is its readiness for the new FCC standards STIR (Secure Telephony Identity Revisited) and SHAKEN (Secure Handling of Asserted information using toKENs). Under these frameworks, calls traveling through the interconnected phone networks would be signed as legitimate by originating carriers and validated by other carriers before reaching consumers. STIR and SHAKEN would digitally validate the handoff of calls passing through the web of networks, letting the carrier of the person that's receiving the call verify that it's from the person supposedly making it.

FCC Chairman Ajit Pai recently urged all carriers to make plans for supporting the STIR and SHAKEN standards, and T-Mo says that it's ready for them.