1. Short title This Act may be cited as the ECPA Modernization Act of 2017 . 2. Warrant for stored content and geolocation information (a) Voluntary disclosure of customer communications or records Section 2702 of title 18, United States Code, is amended— (1) in subsection (a)— (A) in paragraph (1)— (i) by striking divulge and inserting disclose ; and (ii) by striking while in electronic storage by that service and inserting that is in electronic storage with or otherwise stored, held, or maintained by that service ; (B) in paragraph (2), in the matter preceding subparagraph (A)— (i) by striking to the public ; (ii) by striking divulge and inserting disclose ; and (iii) by striking which is carried or maintained on and inserting that is stored, held, or maintained by ; and (C) in paragraph (3)— (i) by striking a provider of and inserting a person or entity providing ; (ii) by inserting , or a geolocation service, after public ; (iii) by striking divulge and inserting disclose the contents of any communication described in section 2703(a) ; (iv) by striking a record and inserting , any records, geolocation information, ; and (v) by striking (not including the contents of communications covered by paragraph (1) or (2)) to any governmental entity and inserting to any governmental entity ; (2) in subsection (b)— (A) in the matter preceding paragraph (1)— (i) by striking divulge and inserting disclose ; and (ii) by inserting wire or electronic before communication ; (B) by striking paragraph (1) and inserting the following: (1) to an originator, addressee, or intended recipient of such communication, to the subscriber or customer on whose behalf the provider stores, holds, or maintains such communication, or to an agent of such addressee, intended recipient, subscriber, or customer;