SECTION 1. Short title.

SEC. 2. Voluntary disclosure corrections.

SEC. 3. Amendments to required disclosure section.

(1) by striking subsections (a) through (c) and inserting the following:

“(a) Contents of wire or electronic communications in electronic storage.—Except as provided in subsections (i) and (j), a governmental entity may require the disclosure by a provider of electronic communication service of the contents of a wire or electronic communication that is in electronic storage with or otherwise stored, held, or maintained by that service only if the governmental entity obtains a warrant issued using the procedures described in the Federal Rules of Criminal Procedure (or, in the case of a State court, issued using State warrant procedures) that—

“(1) is issued by a court of competent jurisdiction; and

“(2) may indicate the date by which the provider must make the disclosure to the governmental entity.

In the absence of a date on the warrant indicating the date by which the provider must make disclosure to the governmental entity, the provider shall promptly respond to the warrant.

“(b) Contents of wire or electronic communications in a remote computing service.—

“(1) IN GENERAL.—Except as provided in subsections (i) and (j), a governmental entity may require the disclosure by a provider of remote computing service of the contents of a wire or electronic communication that is stored, held, or maintained by that service only if the governmental entity obtains a warrant issued using the procedures described in the Federal Rules of Criminal Procedure (or, in the case of a State court, issued using State warrant procedures) that—

“(A) is issued by a court of competent jurisdiction; and

“(B) may indicate the date by which the provider must make the disclosure to the governmental entity.

In the absence of a date on the warrant indicating the date by which the provider must make disclosure to the governmental entity, the provider shall promptly respond to the warrant.

“(2) APPLICABILITY.—Paragraph (1) is applicable with respect to any wire or electronic communication that is stored, held, or maintained by the provider—

“(A) on behalf of, and received by means of electronic transmission from (or created by means of computer processing of communication received by means of electronic transmission from), a subscriber or customer of such remote computing service; and

“(B) solely for the purpose of providing storage or computer processing services to such subscriber or customer, if the provider is not authorized to access the contents of any such communications for purposes of providing any services other than storage or computer processing.

“(c) Records concerning electronic communication service or remote computing service.—

“(1) IN GENERAL.—Except as provided in subsections (i) and (j), a governmental entity may require the disclosure by a provider of electronic communication service or remote computing service of a record or other information pertaining to a subscriber to or customer of such service (not including the contents of wire or electronic communications), only—

“(A) if a governmental entity obtains a warrant issued using the procedures described in the Federal Rules of Criminal Procedure (or, in the case of a State court, issued using State warrant procedures) that—

“(i) is issued by a court of competent jurisdiction directing the disclosure; and

“(ii) may indicate the date by which the provider must make the disclosure to the governmental entity;

“(B) if a governmental entity obtains a court order directing the disclosure under subsection (d);

“(C) with the lawful consent of the subscriber or customer; or

“(D) as otherwise authorized in paragraph (2).

“(2) SUBSCRIBER OR CUSTOMER INFORMATION.—A provider of electronic communication service or remote computing service shall, in response to an administrative subpoena authorized by Federal or State statute, a grand jury, trial, or civil discovery subpoena, or any means available under paragraph (1), disclose to a governmental entity the—

“(A) name;

“(B) address;

“(C) local and long distance telephone connection records, or records of session times and durations;

“(D) length of service (including start date) and types of service used;

“(E) telephone or instrument number or other subscriber or customer number or identity, including any temporarily assigned network address; and

“(F) means and source of payment for such service (including any credit card or bank account number),

of a subscriber or customer of such service.

“(3) NOTICE NOT REQUIRED.—A governmental entity that receives records or information under this subsection is not required to provide notice to a subscriber or customer.”;

(2) in subsection (d)—

(A) by striking “(b) or”;

(B) by striking “the contents of a wire or electronic communication, or”;

(C) by striking “sought,” and inserting “sought”; and

(D) by striking “section” and inserting “subsection”; and

(3) by adding at the end the following:

“(h) Notice.—Except as provided in section 2705, a provider of electronic communication service or remote computing service may notify a subscriber or customer of a receipt of a warrant, court order, subpoena, or request under subsection (a), (b), (c), or (d) of this section.

“(i) Rule of construction related to legal process.—Nothing in this section or in section 2702 shall limit the authority of a governmental entity to use an administrative subpoena authorized by Federal or State statute, a grand jury, trial, or civil discovery subpoena, or a warrant issued using the procedures described in the Federal Rules of Criminal Procedure (or, in the case of a State court, issued using State warrant procedures) by a court of competent jurisdiction to—

“(1) require an originator, addressee, or intended recipient of a wire or electronic communication to disclose a wire or electronic communication (including the contents of that communication) to the governmental entity;

“(2) require a person or entity that provides an electronic communication service to the officers, directors, employees, or agents of the person or entity (for the purpose of carrying out their duties) to disclose a wire or electronic communication (including the contents of that communication) to or from the person or entity itself or to or from an officer, director, employee, or agent of the entity to a governmental entity, if the wire or electronic communication is stored, held, or maintained on an electronic communications system owned, operated, or controlled by the person or entity; or

“(3) require a person or entity that provides a remote computing service or electronic communication service to disclose a wire or electronic communication (including the contents of that communication) that advertises or promotes a product or service and that has been made readily accessible to the general public.

“(j) Rule of construction related to Congressional subpoenas.—Nothing in this section or in section 2702 shall limit the power of inquiry vested in the Congress by article I of the Constitution of the United States, including the authority to compel the production of a wire or electronic communication (including the contents of a wire or electronic communication) that is stored, held, or maintained by a person or entity that provides remote computing service or electronic communication service.”.

SEC. 4. Delayed notice.

SEC. 5. Rule of construction.

(1) the contents of a wire or electronic communication pursuant to other lawful authorities, including the authorities under chapter 119 of title 18 (commonly known as the “Wiretap Act”), the Foreign Intelligence Surveillance Act of 1978 (50 U.S.C. 1801 et seq.), or any other provision of Federal law not specifically amended by this Act; or

(2) records or other information relating to a subscriber or customer of any electronic communication service or remote computing service (not including the content of such communications) pursuant to the Foreign Intelligence Surveillance Act of 1978 (50 U.S.C. 1801 et seq.), chapter 119 of title 18 (commonly known as the “Wiretap Act”), or any other provision of Federal law not specifically amended by this Act.