[geary] Transfer Yorba copyrights to Software Freedom Conservancy



commit 654e513f9c95ee666140b168001ff06f260973cd
Author: Adam Dingle <adam medovina org>
Date:   Fri May 6 08:33:37 2016 -0400

    Transfer Yorba copyrights to Software Freedom Conservancy

 CMakeLists.txt                                     |    2 +-
 INSTALL                                            |    2 +-
 Makefile.in                                        |    2 +-
 README                                             |    2 +-
 bindings/vapi/gmime-2.6/gmime-2.6-custom.vala      |    2 +-
 cmake/FindDesktopFileValidate.cmake                |    2 +-
 cmake/FindIntltool.cmake                           |    2 +-
 configure                                          |    2 +-
 debian/copyright                                   |    2 +-
 desktop/geary.appdata.xml                          |    2 +-
 po/ar.po                                           |    4 ++--
 po/bs.po                                           |    6 +++---
 po/ca.po                                           |    8 ++++----
 po/cs.po                                           |    8 ++++----
 po/da.po                                           |    6 +++---
 po/de.po                                           |    8 ++++----
 po/el.po                                           |    8 ++++----
 po/en_CA.po                                        |    4 ++--
 po/en_GB.po                                        |    6 +++---
 po/eo.po                                           |    4 ++--
 po/es.po                                           |    8 ++++----
 po/et.po                                           |    4 ++--
 po/eu.po                                           |    6 +++---
 po/fa.po                                           |    4 ++--
 po/fi.po                                           |    6 +++---
 po/fr.po                                           |    8 ++++----
 po/gl.po                                           |    6 +++---
 po/he.po                                           |    6 +++---
 po/hi.po                                           |    4 ++--
 po/hr.po                                           |    6 +++---
 po/hu.po                                           |    8 ++++----
 po/id.po                                           |    8 ++++----
 po/it.po                                           |    8 ++++----
 po/ja.po                                           |    6 +++---
 po/kk.po                                           |    6 +++---
 po/km.po                                           |    4 ++--
 po/lt.po                                           |    6 +++---
 po/ms.po                                           |    4 ++--
 po/nb.po                                           |    6 +++---
 po/nl.po                                           |   12 ++++++------
 po/oc.po                                           |    8 ++++----
 po/pl.po                                           |    6 +++---
 po/pt.po                                           |    8 ++++----
 po/pt_BR.po                                        |   10 +++++-----
 po/ro.po                                           |    8 ++++----
 po/ru.po                                           |    6 +++---
 po/sk.po                                           |    6 +++---
 po/sl.po                                           |    6 +++---
 po/sr.po                                           |    6 +++---
 po/sr latin po                                     |    6 +++---
 po/sv.po                                           |    8 ++++----
 po/te.po                                           |    4 ++--
 po/tr.po                                           |    8 ++++----
 po/uk.po                                           |    8 ++++----
 po/vi.po                                           |    4 ++--
 po/zh_CN.po                                        |    8 ++++----
 po/zh_TW.po                                        |    6 +++---
 src/CMakeLists.txt                                 |    2 +-
 .../accounts/account-dialog-account-list-pane.vala |    2 +-
 .../accounts/account-dialog-add-edit-pane.vala     |    2 +-
 .../account-dialog-edit-alternate-emails-pane.vala |    2 +-
 src/client/accounts/account-dialog-pane.vala       |    2 +-
 .../account-dialog-remove-confirm-pane.vala        |    2 +-
 .../accounts/account-dialog-remove-fail-pane.vala  |    2 +-
 .../accounts/account-dialog-spinner-pane.vala      |    2 +-
 src/client/accounts/account-dialog.vala            |    2 +-
 src/client/accounts/account-spinner-page.vala      |    2 +-
 src/client/accounts/add-edit-page.vala             |    2 +-
 src/client/accounts/login-dialog.vala              |    2 +-
 src/client/application/autostart-manager.vala      |    2 +-
 src/client/application/geary-action-adapter.vala   |    2 +-
 src/client/application/geary-application.vala      |    4 ++--
 src/client/application/geary-args.vala             |    2 +-
 src/client/application/geary-config.vala           |    2 +-
 src/client/application/geary-controller.vala       |    2 +-
 src/client/application/main.vala                   |    2 +-
 src/client/application/secret-mediator.vala        |    2 +-
 src/client/components/conversation-find-bar.vala   |    2 +-
 src/client/components/count-badge.vala             |    2 +-
 src/client/components/folder-menu.vala             |    2 +-
 src/client/components/icon-factory.vala            |    2 +-
 src/client/components/main-toolbar.vala            |    2 +-
 src/client/components/main-window.vala             |    2 +-
 src/client/components/monitored-progress-bar.vala  |    2 +-
 src/client/components/monitored-spinner.vala       |    2 +-
 src/client/components/pill-toolbar.vala            |    2 +-
 src/client/components/search-bar.vala              |    2 +-
 src/client/components/status-bar.vala              |    2 +-
 src/client/components/stock.vala                   |    2 +-
 src/client/components/stylish-webview.vala         |    2 +-
 src/client/composer/composer-box.vala              |    2 +-
 src/client/composer/composer-container.vala        |    2 +-
 src/client/composer/composer-embed.vala            |    2 +-
 src/client/composer/composer-headerbar.vala        |    2 +-
 src/client/composer/composer-toolbar.vala          |    2 +-
 src/client/composer/composer-widget.vala           |    2 +-
 src/client/composer/composer-window.vala           |    2 +-
 src/client/composer/contact-entry-completion.vala  |    2 +-
 src/client/composer/contact-list-store.vala        |    2 +-
 src/client/composer/email-entry.vala               |    2 +-
 src/client/composer/scrollable-overlay.vala        |    2 +-
 src/client/composer/webview-edit-fixer.vala        |    2 +-
 .../conversation-list-cell-renderer.vala           |    2 +-
 .../conversation-list/conversation-list-store.vala |    2 +-
 .../conversation-list/conversation-list-view.vala  |    2 +-
 .../formatted-conversation-data.vala               |    2 +-
 .../conversation-viewer/conversation-viewer.vala   |    2 +-
 .../conversation-viewer/conversation-web-view.vala |    2 +-
 src/client/dialogs/alert-dialog.vala               |    2 +-
 src/client/dialogs/attachment-dialog.vala          |    2 +-
 src/client/dialogs/certificate-warning-dialog.vala |    2 +-
 src/client/dialogs/password-dialog.vala            |    2 +-
 src/client/dialogs/preferences-dialog.vala         |    2 +-
 src/client/dialogs/upgrade-dialog.vala             |    2 +-
 .../folder-list-abstract-folder-entry.vala         |    2 +-
 .../folder-list/folder-list-account-branch.vala    |    2 +-
 .../folder-list/folder-list-folder-entry.vala      |    2 +-
 .../folder-list-inbox-folder-entry.vala            |    2 +-
 .../folder-list/folder-list-inboxes-branch.vala    |    2 +-
 .../folder-list/folder-list-search-branch.vala     |    2 +-
 .../folder-list/folder-list-special-grouping.vala  |    2 +-
 src/client/folder-list/folder-list-tree.vala       |    2 +-
 src/client/notification/libmessagingmenu.vala      |    2 +-
 src/client/notification/libnotify.vala             |    2 +-
 .../notification/new-messages-indicator.vala       |    2 +-
 src/client/notification/new-messages-monitor.vala  |    2 +-
 src/client/notification/null-indicator.vala        |    2 +-
 src/client/notification/unity-launcher.vala        |    2 +-
 src/client/sidebar/sidebar-branch.vala             |    2 +-
 src/client/sidebar/sidebar-common.vala             |    2 +-
 .../sidebar/sidebar-count-cell-renderer.vala       |    2 +-
 src/client/sidebar/sidebar-entry.vala              |    2 +-
 src/client/sidebar/sidebar-tree.vala               |    2 +-
 src/client/util/util-date.vala                     |    2 +-
 src/client/util/util-email.vala                    |    2 +-
 src/client/util/util-files.vala                    |    2 +-
 src/client/util/util-gravatar.vala                 |    2 +-
 src/client/util/util-gtk.vala                      |    2 +-
 src/client/util/util-international.vala            |    2 +-
 src/client/util/util-random.vala                   |    2 +-
 src/client/util/util-webkit.vala                   |    2 +-
 src/console/main.vala                              |    2 +-
 src/engine/api/geary-abstract-local-folder.vala    |    2 +-
 src/engine/api/geary-account-information.vala      |    2 +-
 src/engine/api/geary-account.vala                  |    2 +-
 .../api/geary-aggregated-folder-properties.vala    |    2 +-
 src/engine/api/geary-attachment.vala               |    2 +-
 src/engine/api/geary-base-object.vala              |    2 +-
 src/engine/api/geary-composed-email.vala           |    2 +-
 src/engine/api/geary-contact-flags.vala            |    2 +-
 src/engine/api/geary-contact-importance.vala       |    2 +-
 src/engine/api/geary-contact-store.vala            |    2 +-
 src/engine/api/geary-contact.vala                  |    2 +-
 src/engine/api/geary-credentials-mediator.vala     |    2 +-
 src/engine/api/geary-credentials.vala              |    2 +-
 src/engine/api/geary-email-flags.vala              |    2 +-
 src/engine/api/geary-email-identifier.vala         |    2 +-
 src/engine/api/geary-email-properties.vala         |    2 +-
 src/engine/api/geary-email.vala                    |    2 +-
 src/engine/api/geary-endpoint.vala                 |    2 +-
 src/engine/api/geary-engine-error.vala             |    2 +-
 src/engine/api/geary-engine.vala                   |    2 +-
 src/engine/api/geary-folder-path.vala              |    2 +-
 src/engine/api/geary-folder-properties.vala        |    2 +-
 src/engine/api/geary-folder-supports-archive.vala  |    2 +-
 src/engine/api/geary-folder-supports-copy.vala     |    2 +-
 src/engine/api/geary-folder-supports-create.vala   |    2 +-
 src/engine/api/geary-folder-supports-empty.vala    |    2 +-
 src/engine/api/geary-folder-supports-mark.vala     |    2 +-
 src/engine/api/geary-folder-supports-move.vala     |    2 +-
 src/engine/api/geary-folder-supports-remove.vala   |    2 +-
 src/engine/api/geary-folder.vala                   |    2 +-
 src/engine/api/geary-logging.vala                  |    2 +-
 src/engine/api/geary-named-flag.vala               |    2 +-
 src/engine/api/geary-named-flags.vala              |    2 +-
 src/engine/api/geary-progress-monitor.vala         |    2 +-
 src/engine/api/geary-revokable.vala                |    2 +-
 src/engine/api/geary-search-folder.vala            |    2 +-
 src/engine/api/geary-search-query.vala             |    2 +-
 src/engine/api/geary-service-provider.vala         |    2 +-
 src/engine/api/geary-service.vala                  |    2 +-
 src/engine/api/geary-special-folder-type.vala      |    2 +-
 src/engine/app/app-conversation-monitor.vala       |    2 +-
 src/engine/app/app-conversation.vala               |    2 +-
 src/engine/app/app-draft-manager.vala              |    2 +-
 src/engine/app/app-email-store.vala                |    2 +-
 .../conversation-monitor/app-append-operation.vala |    2 +-
 .../app-conversation-operation-queue.vala          |    2 +-
 .../app-conversation-operation.vala                |    2 +-
 .../conversation-monitor/app-conversation-set.vala |    2 +-
 .../app-external-append-operation.vala             |    2 +-
 .../app-fill-window-operation.vala                 |    2 +-
 .../app-local-load-operation.vala                  |    2 +-
 .../app-local-search-operation.vala                |    2 +-
 .../conversation-monitor/app-remove-operation.vala |    2 +-
 .../conversation-monitor/app-reseed-operation.vala |    2 +-
 .../app-terminate-operation.vala                   |    2 +-
 .../email-store/app-async-folder-operation.vala    |    2 +-
 src/engine/app/email-store/app-copy-operation.vala |    2 +-
 .../app/email-store/app-fetch-operation.vala       |    2 +-
 src/engine/app/email-store/app-list-operation.vala |    2 +-
 src/engine/app/email-store/app-mark-operation.vala |    2 +-
 src/engine/common/common-message-data.vala         |    2 +-
 src/engine/db/db-connection.vala                   |    2 +-
 src/engine/db/db-context.vala                      |    2 +-
 src/engine/db/db-database-error.vala               |    2 +-
 src/engine/db/db-database.vala                     |    2 +-
 src/engine/db/db-result.vala                       |    2 +-
 src/engine/db/db-statement.vala                    |    2 +-
 src/engine/db/db-synchronous-mode.vala             |    2 +-
 src/engine/db/db-transaction-async-job.vala        |    2 +-
 src/engine/db/db-transaction-outcome.vala          |    2 +-
 src/engine/db/db-transaction-type.vala             |    2 +-
 src/engine/db/db-versioned-database.vala           |    2 +-
 src/engine/db/db.vala                              |    2 +-
 src/engine/imap-db/imap-db-account.vala            |    2 +-
 src/engine/imap-db/imap-db-attachment.vala         |    2 +-
 src/engine/imap-db/imap-db-contact.vala            |    2 +-
 src/engine/imap-db/imap-db-database.vala           |    2 +-
 src/engine/imap-db/imap-db-email-identifier.vala   |    2 +-
 src/engine/imap-db/imap-db-folder.vala             |    2 +-
 src/engine/imap-db/imap-db-gc.vala                 |    2 +-
 src/engine/imap-db/imap-db-message-addresses.vala  |    2 +-
 src/engine/imap-db/imap-db-message-row.vala        |    2 +-
 .../outbox/smtp-outbox-email-identifier.vala       |    2 +-
 .../outbox/smtp-outbox-email-properties.vala       |    2 +-
 .../outbox/smtp-outbox-folder-properties.vala      |    2 +-
 .../imap-db/outbox/smtp-outbox-folder-root.vala    |    2 +-
 src/engine/imap-db/outbox/smtp-outbox-folder.vala  |    2 +-
 .../search/imap-db-search-email-identifier.vala    |    2 +-
 .../search/imap-db-search-folder-properties.vala   |    2 +-
 .../imap-db/search/imap-db-search-folder-root.vala |    2 +-
 .../imap-db/search/imap-db-search-folder.vala      |    2 +-
 .../imap-db/search/imap-db-search-query.vala       |    2 +-
 src/engine/imap-db/search/imap-db-search-term.vala |    2 +-
 .../gmail/imap-engine-gmail-account.vala           |    2 +-
 .../gmail/imap-engine-gmail-all-mail-folder.vala   |    2 +-
 .../gmail/imap-engine-gmail-drafts-folder.vala     |    2 +-
 .../gmail/imap-engine-gmail-folder.vala            |    2 +-
 .../gmail/imap-engine-gmail-search-folder.vala     |    2 +-
 .../gmail/imap-engine-gmail-spam-trash-folder.vala |    2 +-
 .../imap-engine-account-synchronizer.vala          |    2 +-
 .../imap-engine/imap-engine-batch-operations.vala  |    2 +-
 .../imap-engine/imap-engine-contact-store.vala     |    2 +-
 .../imap-engine-email-flag-watcher.vala            |    2 +-
 .../imap-engine/imap-engine-email-prefetcher.vala  |    2 +-
 .../imap-engine/imap-engine-generic-account.vala   |    2 +-
 .../imap-engine/imap-engine-generic-folder.vala    |    2 +-
 .../imap-engine/imap-engine-minimal-folder.vala    |    2 +-
 .../imap-engine/imap-engine-replay-operation.vala  |    2 +-
 .../imap-engine/imap-engine-replay-queue.vala      |    2 +-
 .../imap-engine-revokable-committed-move.vala      |    2 +-
 .../imap-engine/imap-engine-revokable-move.vala    |    2 +-
 .../imap-engine-send-replay-operation.vala         |    2 +-
 src/engine/imap-engine/imap-engine.vala            |    2 +-
 .../other/imap-engine-other-account.vala           |    2 +-
 .../other/imap-engine-other-folder.vala            |    2 +-
 .../outlook/imap-engine-outlook-account.vala       |    2 +-
 .../outlook/imap-engine-outlook-drafts-folder.vala |    2 +-
 .../outlook/imap-engine-outlook-folder.vala        |    2 +-
 .../imap-engine-abstract-list-email.vala           |    2 +-
 .../replay-ops/imap-engine-copy-email.vala         |    2 +-
 .../replay-ops/imap-engine-create-email.vala       |    2 +-
 .../replay-ops/imap-engine-empty-folder.vala       |    2 +-
 .../replay-ops/imap-engine-fetch-email.vala        |    2 +-
 .../replay-ops/imap-engine-list-email-by-id.vala   |    2 +-
 .../imap-engine-list-email-by-sparse-id.vala       |    2 +-
 .../replay-ops/imap-engine-mark-email.vala         |    2 +-
 .../replay-ops/imap-engine-move-email-commit.vala  |    2 +-
 .../replay-ops/imap-engine-move-email-prepare.vala |    2 +-
 .../replay-ops/imap-engine-move-email-revoke.vala  |    2 +-
 .../replay-ops/imap-engine-remove-email.vala       |    2 +-
 .../replay-ops/imap-engine-replay-append.vala      |    2 +-
 .../replay-ops/imap-engine-replay-disconnect.vala  |    2 +-
 .../replay-ops/imap-engine-replay-removal.vala     |    2 +-
 .../imap-engine-server-search-email.vala           |    2 +-
 .../replay-ops/imap-engine-user-close.vala         |    2 +-
 .../yahoo/imap-engine-yahoo-account.vala           |    2 +-
 .../yahoo/imap-engine-yahoo-folder.vala            |    2 +-
 src/engine/imap/api/imap-account.vala              |    2 +-
 src/engine/imap/api/imap-email-flags.vala          |    2 +-
 src/engine/imap/api/imap-email-properties.vala     |    2 +-
 src/engine/imap/api/imap-folder-properties.vala    |    2 +-
 src/engine/imap/api/imap-folder-root.vala          |    2 +-
 src/engine/imap/api/imap-folder.vala               |    2 +-
 src/engine/imap/command/imap-append-command.vala   |    2 +-
 .../imap/command/imap-capability-command.vala      |    2 +-
 src/engine/imap/command/imap-close-command.vala    |    2 +-
 src/engine/imap/command/imap-command.vala          |    2 +-
 src/engine/imap/command/imap-compress-command.vala |    2 +-
 src/engine/imap/command/imap-copy-command.vala     |    2 +-
 src/engine/imap/command/imap-create-command.vala   |    2 +-
 src/engine/imap/command/imap-examine-command.vala  |    2 +-
 src/engine/imap/command/imap-expunge-command.vala  |    2 +-
 src/engine/imap/command/imap-fetch-command.vala    |    2 +-
 src/engine/imap/command/imap-id-command.vala       |    2 +-
 src/engine/imap/command/imap-idle-command.vala     |    2 +-
 src/engine/imap/command/imap-list-command.vala     |    2 +-
 .../imap/command/imap-list-return-parameter.vala   |    2 +-
 src/engine/imap/command/imap-login-command.vala    |    2 +-
 src/engine/imap/command/imap-logout-command.vala   |    2 +-
 src/engine/imap/command/imap-message-set.vala      |    2 +-
 src/engine/imap/command/imap-noop-command.vala     |    2 +-
 src/engine/imap/command/imap-search-command.vala   |    2 +-
 src/engine/imap/command/imap-search-criteria.vala  |    2 +-
 src/engine/imap/command/imap-search-criterion.vala |    2 +-
 src/engine/imap/command/imap-select-command.vala   |    2 +-
 src/engine/imap/command/imap-starttls-command.vala |    2 +-
 src/engine/imap/command/imap-status-command.vala   |    2 +-
 src/engine/imap/command/imap-store-command.vala    |    2 +-
 src/engine/imap/imap-error.vala                    |    2 +-
 src/engine/imap/imap.vala                          |    2 +-
 src/engine/imap/message/imap-data-format.vala      |    2 +-
 src/engine/imap/message/imap-envelope.vala         |    2 +-
 .../message/imap-fetch-body-data-specifier.vala    |    2 +-
 .../imap/message/imap-fetch-data-specifier.vala    |    2 +-
 src/engine/imap/message/imap-flag.vala             |    2 +-
 src/engine/imap/message/imap-flags.vala            |    2 +-
 src/engine/imap/message/imap-internal-date.vala    |    2 +-
 .../imap/message/imap-mailbox-parameter.vala       |    2 +-
 .../imap/message/imap-mailbox-specifier.vala       |    2 +-
 src/engine/imap/message/imap-message-data.vala     |    2 +-
 src/engine/imap/message/imap-message-flag.vala     |    2 +-
 src/engine/imap/message/imap-message-flags.vala    |    2 +-
 src/engine/imap/message/imap-sequence-number.vala  |    2 +-
 src/engine/imap/message/imap-status-data-type.vala |    2 +-
 src/engine/imap/message/imap-tag.vala              |    2 +-
 src/engine/imap/message/imap-uid-validity.vala     |    2 +-
 src/engine/imap/message/imap-uid.vala              |    2 +-
 src/engine/imap/parameter/imap-atom-parameter.vala |    2 +-
 src/engine/imap/parameter/imap-list-parameter.vala |    2 +-
 .../imap/parameter/imap-literal-parameter.vala     |    2 +-
 src/engine/imap/parameter/imap-nil-parameter.vala  |    2 +-
 .../imap/parameter/imap-number-parameter.vala      |    2 +-
 src/engine/imap/parameter/imap-parameter.vala      |    2 +-
 .../parameter/imap-quoted-string-parameter.vala    |    2 +-
 .../imap/parameter/imap-root-parameters.vala       |    2 +-
 .../imap/parameter/imap-string-parameter.vala      |    2 +-
 .../parameter/imap-unquoted-string-parameter.vala  |    2 +-
 src/engine/imap/response/imap-capabilities.vala    |    2 +-
 .../imap/response/imap-continuation-response.vala  |    2 +-
 .../imap/response/imap-fetch-data-decoder.vala     |    2 +-
 src/engine/imap/response/imap-fetched-data.vala    |    2 +-
 .../imap/response/imap-mailbox-attribute.vala      |    2 +-
 .../imap/response/imap-mailbox-attributes.vala     |    2 +-
 .../imap/response/imap-mailbox-information.vala    |    2 +-
 .../imap/response/imap-response-code-type.vala     |    2 +-
 src/engine/imap/response/imap-response-code.vala   |    2 +-
 .../imap/response/imap-server-data-type.vala       |    2 +-
 src/engine/imap/response/imap-server-data.vala     |    2 +-
 src/engine/imap/response/imap-server-response.vala |    2 +-
 src/engine/imap/response/imap-status-data.vala     |    2 +-
 src/engine/imap/response/imap-status-response.vala |    2 +-
 src/engine/imap/response/imap-status.vala          |    2 +-
 .../imap/transport/imap-client-connection.vala     |    2 +-
 .../transport/imap-client-session-manager.vala     |    2 +-
 src/engine/imap/transport/imap-client-session.vala |    2 +-
 src/engine/imap/transport/imap-deserializer.vala   |    2 +-
 src/engine/imap/transport/imap-serializer.vala     |    2 +-
 src/engine/memory/memory-buffer.vala               |    2 +-
 src/engine/memory/memory-byte-buffer.vala          |    2 +-
 src/engine/memory/memory-empty-buffer.vala         |    2 +-
 src/engine/memory/memory-file-buffer.vala          |    2 +-
 src/engine/memory/memory-growable-buffer.vala      |    2 +-
 src/engine/memory/memory-offset-buffer.vala        |    2 +-
 src/engine/memory/memory-string-buffer.vala        |    2 +-
 .../memory/memory-unowned-byte-array-buffer.vala   |    2 +-
 src/engine/memory/memory-unowned-bytes-buffer.vala |    2 +-
 .../memory/memory-unowned-string-buffer.vala       |    2 +-
 src/engine/mime/mime-content-disposition.vala      |    2 +-
 src/engine/mime/mime-content-parameters.vala       |    2 +-
 src/engine/mime/mime-content-type.vala             |    2 +-
 src/engine/mime/mime-data-format.vala              |    2 +-
 src/engine/mime/mime-disposition-type.vala         |    2 +-
 src/engine/mime/mime-error.vala                    |    2 +-
 src/engine/mime/mime-multipart-subtype.vala        |    2 +-
 .../nonblocking-abstract-semaphore.vala            |    2 +-
 src/engine/nonblocking/nonblocking-batch.vala      |    2 +-
 src/engine/nonblocking/nonblocking-concurrent.vala |    2 +-
 .../nonblocking-counting-semaphore.vala            |    2 +-
 src/engine/nonblocking/nonblocking-error.vala      |    2 +-
 src/engine/nonblocking/nonblocking-mailbox.vala    |    2 +-
 src/engine/nonblocking/nonblocking-mutex.vala      |    2 +-
 .../nonblocking-reporting-semaphore.vala           |    2 +-
 src/engine/nonblocking/nonblocking-variants.vala   |    2 +-
 src/engine/rfc822/rfc822-error.vala                |    2 +-
 .../rfc822/rfc822-gmime-filter-blockquotes.vala    |    2 +-
 src/engine/rfc822/rfc822-gmime-filter-flowed.vala  |    2 +-
 src/engine/rfc822/rfc822-gmime-filter-plain.vala   |    2 +-
 src/engine/rfc822/rfc822-mailbox-address.vala      |    2 +-
 src/engine/rfc822/rfc822-mailbox-addresses.vala    |    2 +-
 src/engine/rfc822/rfc822-message-data.vala         |    2 +-
 src/engine/rfc822/rfc822-message.vala              |    2 +-
 src/engine/rfc822/rfc822-utils.vala                |    2 +-
 src/engine/rfc822/rfc822.vala                      |    2 +-
 src/engine/smtp/smtp-authenticator.vala            |    2 +-
 src/engine/smtp/smtp-capabilities.vala             |    2 +-
 src/engine/smtp/smtp-client-connection.vala        |    2 +-
 src/engine/smtp/smtp-client-session.vala           |    2 +-
 src/engine/smtp/smtp-command.vala                  |    2 +-
 src/engine/smtp/smtp-data-format.vala              |    2 +-
 src/engine/smtp/smtp-error.vala                    |    2 +-
 src/engine/smtp/smtp-greeting.vala                 |    2 +-
 src/engine/smtp/smtp-login-authenticator.vala      |    2 +-
 src/engine/smtp/smtp-plain-authenticator.vala      |    2 +-
 src/engine/smtp/smtp-request.vala                  |    2 +-
 src/engine/smtp/smtp-response-code.vala            |    2 +-
 src/engine/smtp/smtp-response-line.vala            |    2 +-
 src/engine/smtp/smtp-response.vala                 |    2 +-
 src/engine/state/state-machine-descriptor.vala     |    2 +-
 src/engine/state/state-machine.vala                |    2 +-
 src/engine/state/state-mapping.vala                |    2 +-
 src/engine/util/util-ascii.vala                    |    2 +-
 src/engine/util/util-collection.vala               |    2 +-
 src/engine/util/util-converter.vala                |    2 +-
 src/engine/util/util-files.vala                    |    2 +-
 src/engine/util/util-generic-capabilities.vala     |    2 +-
 src/engine/util/util-html.vala                     |    2 +-
 src/engine/util/util-imap-utf7.vala                |    2 +-
 src/engine/util/util-inet.vala                     |    2 +-
 src/engine/util/util-iterable.vala                 |    2 +-
 src/engine/util/util-numeric.vala                  |    2 +-
 src/engine/util/util-object.vala                   |    2 +-
 src/engine/util/util-reference-semantics.vala      |    2 +-
 src/engine/util/util-scheduler.vala                |    2 +-
 src/engine/util/util-stream.vala                   |    2 +-
 src/engine/util/util-string.vala                   |    2 +-
 src/engine/util/util-synchronization.vala          |    2 +-
 src/engine/util/util-time.vala                     |    2 +-
 src/engine/util/util-trillian.vala                 |    2 +-
 src/mailer/main.vala                               |    2 +-
 431 files changed, 537 insertions(+), 537 deletions(-)
---
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7e0032..f44bac8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Geary build script
-# Copyright 2011-2015 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 #
 # Check http://webdev.elementaryos.org/docs/developer-guide/cmake for documentation
 
diff --git a/INSTALL b/INSTALL
index 77f598b..3a521b5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -123,4 +123,4 @@
         $ sudo make uninstall
 
 
-    Copyright 2012-2015 Yorba Foundation
+    Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/Makefile.in b/Makefile.in
index a966404..32ccaff 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile.in
 #
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 
 BUILD_DIR := build
 BINARIES := geary geary-console geary-mailer
diff --git a/README b/README
index 0f019be..482854a 100644
--- a/README
+++ b/README
@@ -34,5 +34,5 @@
 
 
 
-    Copyright 2012-2015 Yorba Foundation
+    Copyright 2016 Software Freedom Conservancy Inc.
 
diff --git a/bindings/vapi/gmime-2.6/gmime-2.6-custom.vala b/bindings/vapi/gmime-2.6/gmime-2.6-custom.vala
index 6cdcbf8..63aebaa 100644
--- a/bindings/vapi/gmime-2.6/gmime-2.6-custom.vala
+++ b/bindings/vapi/gmime-2.6/gmime-2.6-custom.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/cmake/FindDesktopFileValidate.cmake b/cmake/FindDesktopFileValidate.cmake
index 448e54d..250c838 100644
--- a/cmake/FindDesktopFileValidate.cmake
+++ b/cmake/FindDesktopFileValidate.cmake
@@ -1,7 +1,7 @@
 # FindDesktopFileValidate.cmake
 #
 # Charles Lindsay <chaz yorba org>
-# Copyright 2013-2015 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 
 find_program (DESKTOP_FILE_VALIDATE_EXECUTABLE desktop-file-validate)
 
diff --git a/cmake/FindIntltool.cmake b/cmake/FindIntltool.cmake
index 644b9e3..067b360 100644
--- a/cmake/FindIntltool.cmake
+++ b/cmake/FindIntltool.cmake
@@ -1,7 +1,7 @@
 # FindIntltool.cmake
 #
 # Jim Nelson <jim yorba org>
-# Copyright 2012-2015 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 
 find_program (INTLTOOL_MERGE_EXECUTABLE intltool-merge)
 
diff --git a/configure b/configure
index a2b5057..a991cba 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 #
 # This software is licensed under the GNU LGPL (version 2.1 or later).
 # See the COPYING file in this distribution. 
diff --git a/debian/copyright b/debian/copyright
index 3301bad..aee6639 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: geary
 Source: <https://wiki.gnome.org/Apps/Geary>
 
 Files: *
-Copyright: 2012-2015 Yorba Foundation
+Copyright: 2016 Software Freedom Conservancy Inc.
 License: LGPL-2.1
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
diff --git a/desktop/geary.appdata.xml b/desktop/geary.appdata.xml
index 7c5a9c1..b8076b7 100644
--- a/desktop/geary.appdata.xml
+++ b/desktop/geary.appdata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2013-2014 Yorba Foundation <geary yorba org> -->
+<!-- Copyright 2016 Software Freedom Conservancy Inc. -->
 <component type="desktop">
   <id>geary.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
diff --git a/po/ar.po b/po/ar.po
index 7892527..b736fae 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -447,7 +447,7 @@ msgid "Copy _Link"
 msgstr "نسخ الرابط"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "جميع الحقوق محفوظة 2011-2013 Yorba Foundation."
 
 #: ../../ui/composer.glade:21
diff --git a/po/bs.po b/po/bs.po
index c987dc9..884c9be 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -69,7 +69,7 @@ msgstr "_Dodaj"
 msgid "Accounts"
 msgstr "Korisnički računi"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  Seje the COPYING file in this distribution.
@@ -175,7 +175,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Korisničko ime ili lozinka nije tačna.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Zaštita autorskog prava 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
@@ -912,7 +912,7 @@ msgstr "_Od:"
 msgid "From:"
 msgstr "Od:"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  Seje the COPYING file in this distribution.
diff --git a/po/ca.po b/po/ca.po
index 40bbb69..6e33376 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -77,7 +77,7 @@ msgstr ""
 msgid "Accounts"
 msgstr "Comptes"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -186,8 +186,8 @@ msgstr "        &#8226; Nom d'usuari o contrasenya incorrecte(s).\n"
 
 #: ../src/client/application/geary-application.vala:19
 #, fuzzy
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/cs.po b/po/cs.po
index 2568b56..b6f4b35 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -77,7 +77,7 @@ msgstr "Dodatečné adresy pro %s"
 msgid "Accounts"
 msgstr "Účty"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -183,8 +183,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nesprávné uživatelské jméno nebo heslo.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011 – 2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/da.po b/po/da.po
index 539c705..131209f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -437,8 +437,8 @@ msgid "Copy _Link"
 msgstr "Kopiér _link"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../../ui/composer.glade:21
 msgid "Cu_t"
diff --git a/po/de.po b/po/de.po
index e54b3d4..f69a21a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -83,7 +83,7 @@ msgstr "Zusätzliche Adressen für %s"
 msgid "Accounts"
 msgstr "Konten"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -189,8 +189,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; IMAP-Benutzername oder Passwort ungültig.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/el.po b/po/el.po
index 4c06b4b..835367b 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # Translators:
 # George Petsagourakis <petsagouris gmail com>, 2013.
@@ -79,7 +79,7 @@ msgstr "Πρόσθετες διευθύνσεις για %s"
 msgid "Accounts"
 msgstr "Λογαριασμοί"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -190,8 +190,8 @@ msgstr "        &#8226; Λάθος όνομα χρήστη ή κωδικός π
 
 #: ../src/client/application/geary-application.vala:19
 #, fuzzy
-#| msgid "Copyright 2011-2014 Yorba Foundation"
-msgid "Copyright 2011-2015 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Πνευματική ιδιοκτησία 2011-2014 Ίδρυμα Yorba"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/en_CA.po b/po/en_CA.po
index 34ed77b..0fec994 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -426,7 +426,7 @@ msgid "Copy _Link"
 msgstr "Copy _Link"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
 #: ../../ui/composer.glade:21
diff --git a/po/en_GB.po b/po/en_GB.po
index 32cc694..556c4b7 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -438,8 +438,8 @@ msgid "Copy _Link"
 msgstr "Copy _Link"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../../ui/composer.glade:21
 msgid "Cu_t"
diff --git a/po/eo.po b/po/eo.po
index 6e2f4b7..cdc767a 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -428,7 +428,7 @@ msgid "Copy _Link"
 msgstr ""
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
 #: ../../ui/composer.glade:21
diff --git a/po/es.po b/po/es.po
index 7ca1304..5061285 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -82,7 +82,7 @@ msgstr "Direcciones adicionales para %s"
 msgid "Accounts"
 msgstr "Cuentas"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -188,8 +188,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nombre de usuario o contraseña incorrectos.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011–2015 Fundación Yorba"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/et.po b/po/et.po
index 25703d5..182830b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -432,7 +432,7 @@ msgid "Copy _Link"
 msgstr "Kopeeri _lingi aadress"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Autoriõigused 2011-2013 Yorba Foundation"
 
 #: ../../ui/composer.glade:21
diff --git a/po/eu.po b/po/eu.po
index 5371bae..27bc9aa 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -154,8 +154,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Okerreko erabiltzaile-izena edo pasahitza.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright-a 2011-2014 Yorba Fundazioa"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/fa.po b/po/fa.po
index 5d0f07b..b5e2853 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -430,7 +430,7 @@ msgid "Copy _Link"
 msgstr "کپی کردن پیوند"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "حق کپی از 2011 تا 2013 برای بنیاد Yorba محفوظ است"
 
 #: ../../ui/composer.glade:21
diff --git a/po/fi.po b/po/fi.po
index 9846f12..9bffead 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -76,7 +76,7 @@ msgstr "Lisäosoitteet tilille %s"
 msgid "Accounts"
 msgstr "Tilit"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -182,7 +182,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Käyttäjätunnus tai salasana on väärin.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Tekijänoikeus 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/fr.po b/po/fr.po
index ec09a9a..b7e78d3 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -87,7 +87,7 @@ msgstr "Adresses supplémentaires pour %s"
 msgid "Accounts"
 msgstr "Comptes"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -193,8 +193,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Mot de passe ou nom d'utilisateur incorrect.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Fondation Yorba"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/gl.po b/po/gl.po
index 2fd7766..c545f0c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # Translators:
 # mbouzada <mbouzada gmail com>, 2013
@@ -146,8 +146,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nome de usuario ou contrasinal incorrecto.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/he.po b/po/he.po
index 00fb2bf..0136775 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -81,7 +81,7 @@ msgstr "כתובות נוספות עבור %s"
 msgid "Accounts"
 msgstr "משתמשים"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -187,7 +187,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; שם משתמש או ססמה אינם נכונים.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "כל הזכויות שמורות 2011–2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/hi.po b/po/hi.po
index 6ee6a18..e503013 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -428,7 +428,7 @@ msgid "Copy _Link"
 msgstr ""
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "सत्त्वाधिकार 2011-2013 योरबा फ़ाउंडेशन"
 
 #: ../../ui/composer.glade:21
diff --git a/po/hr.po b/po/hr.po
index 9a3b411..21ad6eb 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -447,8 +447,8 @@ msgid "Copy _Link"
 msgstr "Kopiranje _linka"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../../ui/composer.glade:21
 msgid "Cu_t"
diff --git a/po/hu.po b/po/hu.po
index b868d80..222383c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,5 +1,5 @@
 # Hungarian translation for Geary email client.
-# Copyright (C) 2011-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the same license as the geary package.
 #
 # lukibeni <lukacs bence1 gmail com>, 2012, 2013.
@@ -77,7 +77,7 @@ msgstr "További címek a következőhöz: %s"
 msgid "Accounts"
 msgstr "Fiókok"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -184,8 +184,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; A felhasználónév vagy jelszó helytelen.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/id.po b/po/id.po
index 6c114f1..1082096 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,5 +1,5 @@
 # Indonesian translation of geary
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -71,7 +71,7 @@ msgstr "T_ambah"
 msgid "Accounts"
 msgstr "Akun"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -171,7 +171,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "&#8226; Nama pengguna atau sandi salah.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Hak Cipta 2011-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
@@ -846,7 +846,7 @@ msgstr "_Dari:"
 msgid "From:"
 msgstr "Dari:"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/po/it.po b/po/it.po
index d380bcd..61b8f83 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -84,7 +84,7 @@ msgstr "Indirizzi aggiuntivi per %s"
 msgid "Accounts"
 msgstr "Account"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -190,8 +190,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nome utente o password non corretti.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/ja.po b/po/ja.po
index 07fbd2f..660c9fc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -429,8 +429,8 @@ msgid "Copy _Link"
 msgstr "リンクのアドレスをコピー(_L)"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
-msgstr "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../../ui/composer.glade:21
 msgid "Cu_t"
diff --git a/po/kk.po b/po/kk.po
index 67c9688..325543c 100644
--- a/po/kk.po
+++ b/po/kk.po
@@ -73,7 +73,7 @@ msgstr "%s үшін қосымша адрестер"
 msgid "Accounts"
 msgstr "Тіркелгілер"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -179,8 +179,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Пайдаланушы аты не паролі қате.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/km.po b/po/km.po
index 70ffef5..348fbdc 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -421,7 +421,7 @@ msgid "Copy _Link"
 msgstr ""
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
 #: ../../ui/composer.glade:21
diff --git a/po/lt.po b/po/lt.po
index a5b222d..e356345 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -79,7 +79,7 @@ msgstr "Papildomi %s adresai"
 msgid "Accounts"
 msgstr "Paskyros"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -185,7 +185,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; neteisingas naudotojo vardas ar slaptažodis.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Autorinės teisės priklauso 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/ms.po b/po/ms.po
index 37d8014..56a460e 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -429,7 +429,7 @@ msgid "Copy _Link"
 msgstr "Salin _Pautan"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Hakcipta 2011-2013 Yayasan Yorba"
 
 #: ../../ui/composer.glade:21
diff --git a/po/nb.po b/po/nb.po
index e6aa781..e39d14a 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -79,7 +79,7 @@ msgstr "Flere adresser for %s"
 msgid "Accounts"
 msgstr "Kontoer"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -185,7 +185,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Brukernavn eller passord er feil.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Opphavsrett 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/nl.po b/po/nl.po
index 660ef68..779c9fc 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -70,7 +70,7 @@ msgstr "_Toevoegen"
 msgid "Accounts"
 msgstr "Accounts"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -170,9 +170,9 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Gebruikersnaam of wachtwoord onjuist.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
-msgstr "Copyright 2011-2014 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
@@ -857,7 +857,7 @@ msgstr "_Van:"
 msgid "From:"
 msgstr "Van:"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/po/oc.po b/po/oc.po
index 1460ea8..8118fcb 100644
--- a/po/oc.po
+++ b/po/oc.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # Translators:
 # Cédric Valmary (totenoc.eu) <cvalmary yahoo fr>, 2016.
@@ -75,7 +75,7 @@ msgstr "Adreças suplementàrias per %s"
 msgid "Accounts"
 msgstr "Comptes"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -181,8 +181,8 @@ msgid "        &#8226; Username or password incorrècte.\n"
 msgstr "        &#8226; Senhal o nom d'utilizaire incorrècte.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Fondation Yorba"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/pl.po b/po/pl.po
index 55b92f0..a24265b 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -85,7 +85,7 @@ msgstr "Dodatkowe adresy dla %s"
 msgid "Accounts"
 msgstr "Konta"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -191,8 +191,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Niepoprawna nazwa użytkownika lub hasło.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Fundacja Yorba"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/pt.po b/po/pt.po
index 075b626..5446ce4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -81,7 +81,7 @@ msgstr "Endereços adicionais para %s"
 msgid "Accounts"
 msgstr "Contas"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -189,8 +189,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; utilizador ou senha inválidos.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2015 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Direitos de autor 2011-2015 Fundação Yorba"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9d390e9..4f2ede7 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,5 +1,5 @@
 # Brazilian Portuguese translation for Geary email client
-# Copyright 2012-2014 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators (Transifex):
@@ -85,7 +85,7 @@ msgstr "Endereço adicional para %s"
 msgid "Accounts"
 msgstr "Contas"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -191,9 +191,9 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Nome de usuário ou senha incorretos.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2014 Yorba Foundation"
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/ro.po b/po/ro.po
index 83a2e57..f36a435 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # Translators:
 # chodella <corneliu dascalu gmail com>, 2013
@@ -65,7 +65,7 @@ msgstr "_Adaugă"
 msgid "Accounts"
 msgstr "Conturi"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -163,7 +163,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Numele de utilizator sau parola sunt incorecte.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Drepturi de autor 2011-2014 Fundația Yorba"
 
 #: ../src/client/application/geary-application.vala:21
@@ -845,7 +845,7 @@ msgstr "_De la:"
 msgid "From:"
 msgstr "De la:"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/po/ru.po b/po/ru.po
index 968cf30..9242ca8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -82,7 +82,7 @@ msgstr "Дополнительные адреса для %s"
 msgid "Accounts"
 msgstr "Учётные записи"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -190,7 +190,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Неверные имя пользователя или пароль.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Авторское право © 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/sk.po b/po/sk.po
index f69266a..c1452b2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -76,7 +76,7 @@ msgstr "Dodatočné adresy pre %s"
 msgid "Accounts"
 msgstr "Účty"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -184,7 +184,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Používateľské meno alebo heslo je nesprávne.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Autorské práva 2011-2015 Nadácia Yorba"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/sl.po b/po/sl.po
index 01e8bb9..2f2178b 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -64,7 +64,7 @@ msgstr "_Dodaj"
 msgid "Accounts"
 msgstr "Računi"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -164,8 +164,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "&#8226; Uporabniško ime ali geslo je napačno.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Avtorske pravice © 2004-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/sr.po b/po/sr.po
index 910a58f..5d862f3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,6 +1,6 @@
 # Serbian translation of Geary email client
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2014.
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # igorpan <mazezamte gmail com>, 2012
 # Мирослав Николић <miroslavnikolic rocketmail com>, 2014.
@@ -80,7 +80,7 @@ msgstr "Додатне адресе за %s"
 msgid "Accounts"
 msgstr "Налози"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -186,7 +186,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Нетачно корисничко име или лозинка.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Ауторска права 2011-2015 Јорба (Yorba) Фондација"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/sr latin po b/po/sr latin po
index d45c89f..56b5903 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,6 +1,6 @@
 # Serbian translation of Geary email client
 # Courtesy of Prevod.org team (http://prevod.org/) -- 2012—2014.
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # igorpan <mazezamte gmail com>, 2012
 # Miroslav Nikolić <miroslavnikolic rocketmail com>, 2014.
@@ -80,7 +80,7 @@ msgstr "Dodatne adrese za %s"
 msgid "Accounts"
 msgstr "Nalozi"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -186,7 +186,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Netačno korisničko ime ili lozinka.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Autorska prava 2011-2015 Jorba (Yorba) Fondacija"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/sv.po b/po/sv.po
index 037f338..8544b64 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -82,7 +82,7 @@ msgstr "Ytterligare adresser för %s"
 msgid "Accounts"
 msgstr "Konton"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -188,8 +188,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Felaktigt användarnamn eller lösenord.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
-msgstr "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgstr "Copyright 2016 Software Freedom Conservancy Inc."
 
 #: ../src/client/application/geary-application.vala:21
 msgid "Visit the Yorba web site"
diff --git a/po/te.po b/po/te.po
index 16ac5f4..6650c38 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -424,7 +424,7 @@ msgid "Copy _Link"
 msgstr "లంకెను నకలించు (_L)"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
 #: ../../ui/composer.glade:21
diff --git a/po/tr.po b/po/tr.po
index 80bd351..bbd553d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -77,7 +77,7 @@ msgstr "_Ekle"
 msgid "Accounts"
 msgstr "Hesaplar"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -175,7 +175,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "&#8226; Kullanıcı adı veya parola hatalı.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "Telif Hakkı 2011-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
@@ -859,7 +859,7 @@ msgstr "_Gönderen:"
 msgid "From:"
 msgstr "Gönderen:"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/po/uk.po b/po/uk.po
index 2ebe8ae..77df67d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 # Translators:
 # kosivantsov <kos ivantsov gmail com>, 2012
@@ -64,7 +64,7 @@ msgstr "_Додати"
 msgid "Accounts"
 msgstr "Облікові записи"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -162,7 +162,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; Неправильний користувач або пароль.\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2014 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "© 2011-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
@@ -837,7 +837,7 @@ msgstr "_Від:"
 msgid "From:"
 msgstr "Від:"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/po/vi.po b/po/vi.po
index 1dc6a99..1432e3c 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -423,7 +423,7 @@ msgid "Copy _Link"
 msgstr "Sao chép _đường liên kết"
 
 #: ../../src/client/geary-application.vala:17
-msgid "Copyright 2011-2013 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr ""
 
 #: ../../ui/composer.glade:21
diff --git a/po/zh_CN.po b/po/zh_CN.po
index a9749a5..3573f7a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -68,7 +68,7 @@ msgstr "添加(_A)"
 msgid "Accounts"
 msgstr "帐号"
 
-#. Copyright 2011-2014 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -168,8 +168,8 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; 用户名或密码错误.\n"
 
 #: ../src/client/application/geary-application.vala:19
-#| msgid "Copyright 2011-2013 Yorba Foundation"
-msgid "Copyright 2011-2014 Yorba Foundation"
+#| msgid "Copyright 2016 Software Freedom Conservancy Inc."
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "版权所有 2011-2014 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8e18e86..b53e0f0 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -1,6 +1,6 @@
 # po/geary.pot
 # PO message string template file for Geary email client
-# Copyright 2012-2013 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 # This file is distributed under the GNU LGPL, version 2.1.
 #
 # Translators:
@@ -76,7 +76,7 @@ msgstr "%s 的其他位址"
 msgid "Accounts"
 msgstr "帳號"
 
-#. Copyright 2011-2015 Yorba Foundation
+#. Copyright 2016 Software Freedom Conservancy Inc.
 #. *
 #. * This software is licensed under the GNU Lesser General Public License
 #. * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -182,7 +182,7 @@ msgid "        &#8226; Username or password incorrect.\n"
 msgstr "        &#8226; 使用者名稱或密碼不正確。\n"
 
 #: ../src/client/application/geary-application.vala:19
-msgid "Copyright 2011-2015 Yorba Foundation"
+msgid "Copyright 2016 Software Freedom Conservancy Inc."
 msgstr "著作權所有 2011-2015 Yorba Foundation"
 
 #: ../src/client/application/geary-application.vala:21
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8ab356..124cd18 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Geary build script
-# Copyright 2011-2015 Yorba Foundation
+# Copyright 2016 Software Freedom Conservancy Inc.
 
 set(ENGINE_SRC
 
diff --git a/src/client/accounts/account-dialog-account-list-pane.vala 
b/src/client/accounts/account-dialog-account-list-pane.vala
index d1035bd..e82c379 100644
--- a/src/client/accounts/account-dialog-account-list-pane.vala
+++ b/src/client/accounts/account-dialog-account-list-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-add-edit-pane.vala 
b/src/client/accounts/account-dialog-add-edit-pane.vala
index 65d30ed..4c1e0ef 100644
--- a/src/client/accounts/account-dialog-add-edit-pane.vala
+++ b/src/client/accounts/account-dialog-add-edit-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-edit-alternate-emails-pane.vala 
b/src/client/accounts/account-dialog-edit-alternate-emails-pane.vala
index fd6e166..4a9a185 100644
--- a/src/client/accounts/account-dialog-edit-alternate-emails-pane.vala
+++ b/src/client/accounts/account-dialog-edit-alternate-emails-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-pane.vala b/src/client/accounts/account-dialog-pane.vala
index 46892c5..5ba639f 100644
--- a/src/client/accounts/account-dialog-pane.vala
+++ b/src/client/accounts/account-dialog-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-remove-confirm-pane.vala 
b/src/client/accounts/account-dialog-remove-confirm-pane.vala
index 608a87a..4e7e33c 100644
--- a/src/client/accounts/account-dialog-remove-confirm-pane.vala
+++ b/src/client/accounts/account-dialog-remove-confirm-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-remove-fail-pane.vala 
b/src/client/accounts/account-dialog-remove-fail-pane.vala
index 4a6c3c0..f9b72d5 100644
--- a/src/client/accounts/account-dialog-remove-fail-pane.vala
+++ b/src/client/accounts/account-dialog-remove-fail-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog-spinner-pane.vala 
b/src/client/accounts/account-dialog-spinner-pane.vala
index ff81459..6c39036 100644
--- a/src/client/accounts/account-dialog-spinner-pane.vala
+++ b/src/client/accounts/account-dialog-spinner-pane.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-dialog.vala b/src/client/accounts/account-dialog.vala
index 03c6036..a375cf6 100644
--- a/src/client/accounts/account-dialog.vala
+++ b/src/client/accounts/account-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/account-spinner-page.vala b/src/client/accounts/account-spinner-page.vala
index 8ca92b5..5f9805b 100644
--- a/src/client/accounts/account-spinner-page.vala
+++ b/src/client/accounts/account-spinner-page.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/add-edit-page.vala b/src/client/accounts/add-edit-page.vala
index 226a990..e285a48 100644
--- a/src/client/accounts/add-edit-page.vala
+++ b/src/client/accounts/add-edit-page.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/accounts/login-dialog.vala b/src/client/accounts/login-dialog.vala
index 02a0249..fe0f3d2 100644
--- a/src/client/accounts/login-dialog.vala
+++ b/src/client/accounts/login-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/autostart-manager.vala b/src/client/application/autostart-manager.vala
index e5a60c5..93b34f8 100644
--- a/src/client/application/autostart-manager.vala
+++ b/src/client/application/autostart-manager.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/geary-action-adapter.vala 
b/src/client/application/geary-action-adapter.vala
index f64352d..815b0b1 100644
--- a/src/client/application/geary-action-adapter.vala
+++ b/src/client/application/geary-action-adapter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index 1468639..7ab82e3 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
@@ -16,7 +16,7 @@ public class GearyApplication : Gtk.Application {
     public const string PRGNAME = "geary";
     public const string APP_ID = "org.yorba.geary";
     public const string DESCRIPTION = _("Mail Client");
-    public const string COPYRIGHT = _("Copyright 2011-2015 Yorba Foundation");
+    public const string COPYRIGHT = _("Copyright 2016 Software Freedom Conservancy Inc.");
     public const string WEBSITE = "https://wiki.gnome.org/Apps/Geary";;
     public const string WEBSITE_LABEL = _("Visit the Geary web site");
     public const string BUGREPORT = "https://wiki.gnome.org/Apps/Geary/ReportingABug";;
diff --git a/src/client/application/geary-args.vala b/src/client/application/geary-args.vala
index 8ba4d2a..88c0840 100644
--- a/src/client/application/geary-args.vala
+++ b/src/client/application/geary-args.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/geary-config.vala b/src/client/application/geary-config.vala
index 221cb34..dec799e 100644
--- a/src/client/application/geary-config.vala
+++ b/src/client/application/geary-config.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 3b397bc..4e1b657 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/main.vala b/src/client/application/main.vala
index d1ca34a..c14ae6a 100644
--- a/src/client/application/main.vala
+++ b/src/client/application/main.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/application/secret-mediator.vala b/src/client/application/secret-mediator.vala
index c3e71c1..1d777cd 100644
--- a/src/client/application/secret-mediator.vala
+++ b/src/client/application/secret-mediator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/conversation-find-bar.vala 
b/src/client/components/conversation-find-bar.vala
index ef630bb..008f4d3 100644
--- a/src/client/components/conversation-find-bar.vala
+++ b/src/client/components/conversation-find-bar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/count-badge.vala b/src/client/components/count-badge.vala
index f9380de..d7693cb 100644
--- a/src/client/components/count-badge.vala
+++ b/src/client/components/count-badge.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/folder-menu.vala b/src/client/components/folder-menu.vala
index 2f36c22..0d96e86 100644
--- a/src/client/components/folder-menu.vala
+++ b/src/client/components/folder-menu.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/icon-factory.vala b/src/client/components/icon-factory.vala
index 9505e57..ed860c8 100644
--- a/src/client/components/icon-factory.vala
+++ b/src/client/components/icon-factory.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/main-toolbar.vala
index 8d33713..a03a37f 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/main-toolbar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index d92bc27..5a42312 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/monitored-progress-bar.vala 
b/src/client/components/monitored-progress-bar.vala
index 932e21e..927e64f 100644
--- a/src/client/components/monitored-progress-bar.vala
+++ b/src/client/components/monitored-progress-bar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/monitored-spinner.vala b/src/client/components/monitored-spinner.vala
index 940e0c5..3f87975 100644
--- a/src/client/components/monitored-spinner.vala
+++ b/src/client/components/monitored-spinner.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/pill-toolbar.vala b/src/client/components/pill-toolbar.vala
index 4d8df67..688937a 100644
--- a/src/client/components/pill-toolbar.vala
+++ b/src/client/components/pill-toolbar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/search-bar.vala b/src/client/components/search-bar.vala
index 53a4942..2db74a6 100644
--- a/src/client/components/search-bar.vala
+++ b/src/client/components/search-bar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/status-bar.vala b/src/client/components/status-bar.vala
index 95cfb7c..4897afa 100644
--- a/src/client/components/status-bar.vala
+++ b/src/client/components/status-bar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/stock.vala b/src/client/components/stock.vala
index fb45476..4eb5d86 100644
--- a/src/client/components/stock.vala
+++ b/src/client/components/stock.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/components/stylish-webview.vala b/src/client/components/stylish-webview.vala
index a6edc1a..e68830c 100644
--- a/src/client/components/stylish-webview.vala
+++ b/src/client/components/stylish-webview.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-box.vala b/src/client/composer/composer-box.vala
index 2aaf2b5..3e7f03b 100644
--- a/src/client/composer/composer-box.vala
+++ b/src/client/composer/composer-box.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-container.vala b/src/client/composer/composer-container.vala
index 03d0f6c..10366b2 100644
--- a/src/client/composer/composer-container.vala
+++ b/src/client/composer/composer-container.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-embed.vala b/src/client/composer/composer-embed.vala
index 56b6349..e404e3a 100644
--- a/src/client/composer/composer-embed.vala
+++ b/src/client/composer/composer-embed.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-headerbar.vala b/src/client/composer/composer-headerbar.vala
index 3c8f46f..018a562 100644
--- a/src/client/composer/composer-headerbar.vala
+++ b/src/client/composer/composer-headerbar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-toolbar.vala b/src/client/composer/composer-toolbar.vala
index 3ae3983..8e36c77 100644
--- a/src/client/composer/composer-toolbar.vala
+++ b/src/client/composer/composer-toolbar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index d853c38..db571c1 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/composer-window.vala b/src/client/composer/composer-window.vala
index 42ef70e..93f89cc 100644
--- a/src/client/composer/composer-window.vala
+++ b/src/client/composer/composer-window.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/contact-entry-completion.vala 
b/src/client/composer/contact-entry-completion.vala
index 8f6f52c..faced54 100644
--- a/src/client/composer/contact-entry-completion.vala
+++ b/src/client/composer/contact-entry-completion.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/contact-list-store.vala b/src/client/composer/contact-list-store.vala
index c537221..50b5f42 100644
--- a/src/client/composer/contact-list-store.vala
+++ b/src/client/composer/contact-list-store.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/email-entry.vala b/src/client/composer/email-entry.vala
index dfef724..ba4a157 100644
--- a/src/client/composer/email-entry.vala
+++ b/src/client/composer/email-entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/scrollable-overlay.vala b/src/client/composer/scrollable-overlay.vala
index 366d918..d147b2a 100644
--- a/src/client/composer/scrollable-overlay.vala
+++ b/src/client/composer/scrollable-overlay.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/composer/webview-edit-fixer.vala b/src/client/composer/webview-edit-fixer.vala
index b176dee..70f71c7 100644
--- a/src/client/composer/webview-edit-fixer.vala
+++ b/src/client/composer/webview-edit-fixer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-list/conversation-list-cell-renderer.vala 
b/src/client/conversation-list/conversation-list-cell-renderer.vala
index c24b4d2..d678e9d 100644
--- a/src/client/conversation-list/conversation-list-cell-renderer.vala
+++ b/src/client/conversation-list/conversation-list-cell-renderer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-list/conversation-list-store.vala 
b/src/client/conversation-list/conversation-list-store.vala
index eca2ced..7e3d8c2 100644
--- a/src/client/conversation-list/conversation-list-store.vala
+++ b/src/client/conversation-list/conversation-list-store.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-list/conversation-list-view.vala 
b/src/client/conversation-list/conversation-list-view.vala
index 853cf8a..e81e117 100644
--- a/src/client/conversation-list/conversation-list-view.vala
+++ b/src/client/conversation-list/conversation-list-view.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-list/formatted-conversation-data.vala 
b/src/client/conversation-list/formatted-conversation-data.vala
index 4cd56d2..922e94d 100644
--- a/src/client/conversation-list/formatted-conversation-data.vala
+++ b/src/client/conversation-list/formatted-conversation-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-viewer/conversation-viewer.vala 
b/src/client/conversation-viewer/conversation-viewer.vala
index 9d1f34d..3c1d9f0 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/conversation-viewer/conversation-web-view.vala 
b/src/client/conversation-viewer/conversation-web-view.vala
index 24a5ed7..9b5082b 100644
--- a/src/client/conversation-viewer/conversation-web-view.vala
+++ b/src/client/conversation-viewer/conversation-web-view.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/alert-dialog.vala b/src/client/dialogs/alert-dialog.vala
index 4e04018..af3452a 100644
--- a/src/client/dialogs/alert-dialog.vala
+++ b/src/client/dialogs/alert-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/attachment-dialog.vala b/src/client/dialogs/attachment-dialog.vala
index eec47b8..79884fa 100644
--- a/src/client/dialogs/attachment-dialog.vala
+++ b/src/client/dialogs/attachment-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/certificate-warning-dialog.vala 
b/src/client/dialogs/certificate-warning-dialog.vala
index a08e6bd..5d03430 100644
--- a/src/client/dialogs/certificate-warning-dialog.vala
+++ b/src/client/dialogs/certificate-warning-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/password-dialog.vala b/src/client/dialogs/password-dialog.vala
index e614986..bed58ce 100644
--- a/src/client/dialogs/password-dialog.vala
+++ b/src/client/dialogs/password-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/preferences-dialog.vala b/src/client/dialogs/preferences-dialog.vala
index 389711e..90286b2 100644
--- a/src/client/dialogs/preferences-dialog.vala
+++ b/src/client/dialogs/preferences-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/dialogs/upgrade-dialog.vala b/src/client/dialogs/upgrade-dialog.vala
index 1eee835..9d0b782 100644
--- a/src/client/dialogs/upgrade-dialog.vala
+++ b/src/client/dialogs/upgrade-dialog.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-abstract-folder-entry.vala 
b/src/client/folder-list/folder-list-abstract-folder-entry.vala
index a338102..f53dfcd 100644
--- a/src/client/folder-list/folder-list-abstract-folder-entry.vala
+++ b/src/client/folder-list/folder-list-abstract-folder-entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-account-branch.vala 
b/src/client/folder-list/folder-list-account-branch.vala
index 583af86..3cfbdf6 100644
--- a/src/client/folder-list/folder-list-account-branch.vala
+++ b/src/client/folder-list/folder-list-account-branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-folder-entry.vala 
b/src/client/folder-list/folder-list-folder-entry.vala
index 3d9a7d4..bef1ab9 100644
--- a/src/client/folder-list/folder-list-folder-entry.vala
+++ b/src/client/folder-list/folder-list-folder-entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-inbox-folder-entry.vala 
b/src/client/folder-list/folder-list-inbox-folder-entry.vala
index 73fc955..fab3c70 100644
--- a/src/client/folder-list/folder-list-inbox-folder-entry.vala
+++ b/src/client/folder-list/folder-list-inbox-folder-entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-inboxes-branch.vala 
b/src/client/folder-list/folder-list-inboxes-branch.vala
index 94170a3..96ce354 100644
--- a/src/client/folder-list/folder-list-inboxes-branch.vala
+++ b/src/client/folder-list/folder-list-inboxes-branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-search-branch.vala 
b/src/client/folder-list/folder-list-search-branch.vala
index a6e8b13..8c5c644 100644
--- a/src/client/folder-list/folder-list-search-branch.vala
+++ b/src/client/folder-list/folder-list-search-branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-special-grouping.vala 
b/src/client/folder-list/folder-list-special-grouping.vala
index 0c7c39b..c9a2d95 100644
--- a/src/client/folder-list/folder-list-special-grouping.vala
+++ b/src/client/folder-list/folder-list-special-grouping.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/folder-list/folder-list-tree.vala b/src/client/folder-list/folder-list-tree.vala
index c9dbdc4..d4a3ebe 100644
--- a/src/client/folder-list/folder-list-tree.vala
+++ b/src/client/folder-list/folder-list-tree.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/libmessagingmenu.vala b/src/client/notification/libmessagingmenu.vala
index eb1534b..a9b80dd 100644
--- a/src/client/notification/libmessagingmenu.vala
+++ b/src/client/notification/libmessagingmenu.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/libnotify.vala b/src/client/notification/libnotify.vala
index 97fb517..bb25268 100644
--- a/src/client/notification/libnotify.vala
+++ b/src/client/notification/libnotify.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/new-messages-indicator.vala 
b/src/client/notification/new-messages-indicator.vala
index 9db6fd5..12128b4 100644
--- a/src/client/notification/new-messages-indicator.vala
+++ b/src/client/notification/new-messages-indicator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/new-messages-monitor.vala 
b/src/client/notification/new-messages-monitor.vala
index 24331f1..b60de2b 100644
--- a/src/client/notification/new-messages-monitor.vala
+++ b/src/client/notification/new-messages-monitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/null-indicator.vala b/src/client/notification/null-indicator.vala
index 1e54e3c..eac95fa 100644
--- a/src/client/notification/null-indicator.vala
+++ b/src/client/notification/null-indicator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/notification/unity-launcher.vala b/src/client/notification/unity-launcher.vala
index e111c24..9594d44 100644
--- a/src/client/notification/unity-launcher.vala
+++ b/src/client/notification/unity-launcher.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/sidebar/sidebar-branch.vala b/src/client/sidebar/sidebar-branch.vala
index 7b0e09b..bbb3ca8 100644
--- a/src/client/sidebar/sidebar-branch.vala
+++ b/src/client/sidebar/sidebar-branch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/sidebar/sidebar-common.vala b/src/client/sidebar/sidebar-common.vala
index c4d32d1..7d157ac 100644
--- a/src/client/sidebar/sidebar-common.vala
+++ b/src/client/sidebar/sidebar-common.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/sidebar/sidebar-count-cell-renderer.vala 
b/src/client/sidebar/sidebar-count-cell-renderer.vala
index 1bb5d8c..505709c 100644
--- a/src/client/sidebar/sidebar-count-cell-renderer.vala
+++ b/src/client/sidebar/sidebar-count-cell-renderer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/sidebar/sidebar-entry.vala b/src/client/sidebar/sidebar-entry.vala
index 01dc216..d2d0db4 100644
--- a/src/client/sidebar/sidebar-entry.vala
+++ b/src/client/sidebar/sidebar-entry.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/sidebar/sidebar-tree.vala b/src/client/sidebar/sidebar-tree.vala
index 4ce3046..cecfc40 100644
--- a/src/client/sidebar/sidebar-tree.vala
+++ b/src/client/sidebar/sidebar-tree.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-date.vala b/src/client/util/util-date.vala
index 403667d..57cd1fc 100644
--- a/src/client/util/util-date.vala
+++ b/src/client/util/util-date.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-email.vala b/src/client/util/util-email.vala
index 3f23759..40d1692 100644
--- a/src/client/util/util-email.vala
+++ b/src/client/util/util-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-files.vala b/src/client/util/util-files.vala
index ba59245..d241946 100644
--- a/src/client/util/util-files.vala
+++ b/src/client/util/util-files.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-gravatar.vala b/src/client/util/util-gravatar.vala
index 82cd584..641dcf1 100644
--- a/src/client/util/util-gravatar.vala
+++ b/src/client/util/util-gravatar.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-gtk.vala b/src/client/util/util-gtk.vala
index 01d6da0..e60e7a9 100644
--- a/src/client/util/util-gtk.vala
+++ b/src/client/util/util-gtk.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-international.vala b/src/client/util/util-international.vala
index bfbfac0..d0d9005 100644
--- a/src/client/util/util-international.vala
+++ b/src/client/util/util-international.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-random.vala b/src/client/util/util-random.vala
index a358546..f34ba20 100644
--- a/src/client/util/util-random.vala
+++ b/src/client/util/util-random.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/client/util/util-webkit.vala b/src/client/util/util-webkit.vala
index 13ff1da..98b06ac 100644
--- a/src/client/util/util-webkit.vala
+++ b/src/client/util/util-webkit.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/console/main.vala b/src/console/main.vala
index a67017a..6ae3fff 100644
--- a/src/console/main.vala
+++ b/src/console/main.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-abstract-local-folder.vala b/src/engine/api/geary-abstract-local-folder.vala
index 74f1add..73923ed 100644
--- a/src/engine/api/geary-abstract-local-folder.vala
+++ b/src/engine/api/geary-abstract-local-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-account-information.vala b/src/engine/api/geary-account-information.vala
index 7870785..027f2d7 100644
--- a/src/engine/api/geary-account-information.vala
+++ b/src/engine/api/geary-account-information.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-account.vala b/src/engine/api/geary-account.vala
index 69eac87..33effd3 100644
--- a/src/engine/api/geary-account.vala
+++ b/src/engine/api/geary-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-aggregated-folder-properties.vala 
b/src/engine/api/geary-aggregated-folder-properties.vala
index 4d7f18a..cfb5825 100644
--- a/src/engine/api/geary-aggregated-folder-properties.vala
+++ b/src/engine/api/geary-aggregated-folder-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-attachment.vala b/src/engine/api/geary-attachment.vala
index 4b3703a..fd6624c 100644
--- a/src/engine/api/geary-attachment.vala
+++ b/src/engine/api/geary-attachment.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-base-object.vala b/src/engine/api/geary-base-object.vala
index 18e7d63..da92237 100644
--- a/src/engine/api/geary-base-object.vala
+++ b/src/engine/api/geary-base-object.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-composed-email.vala b/src/engine/api/geary-composed-email.vala
index e4aa3aa..9e9683f 100644
--- a/src/engine/api/geary-composed-email.vala
+++ b/src/engine/api/geary-composed-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-contact-flags.vala b/src/engine/api/geary-contact-flags.vala
index 17b6b90..3ecb910 100644
--- a/src/engine/api/geary-contact-flags.vala
+++ b/src/engine/api/geary-contact-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-contact-importance.vala b/src/engine/api/geary-contact-importance.vala
index c552274..0ea9b25 100644
--- a/src/engine/api/geary-contact-importance.vala
+++ b/src/engine/api/geary-contact-importance.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-contact-store.vala b/src/engine/api/geary-contact-store.vala
index 20e1dc6..fd70936 100644
--- a/src/engine/api/geary-contact-store.vala
+++ b/src/engine/api/geary-contact-store.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-contact.vala b/src/engine/api/geary-contact.vala
index c1f43e9..ea96355 100644
--- a/src/engine/api/geary-contact.vala
+++ b/src/engine/api/geary-contact.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-credentials-mediator.vala b/src/engine/api/geary-credentials-mediator.vala
index 07ef2d1..0fb8a8b 100644
--- a/src/engine/api/geary-credentials-mediator.vala
+++ b/src/engine/api/geary-credentials-mediator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-credentials.vala b/src/engine/api/geary-credentials.vala
index 605e293..ed848b3 100644
--- a/src/engine/api/geary-credentials.vala
+++ b/src/engine/api/geary-credentials.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-email-flags.vala b/src/engine/api/geary-email-flags.vala
index d0078b8..c5d705e 100644
--- a/src/engine/api/geary-email-flags.vala
+++ b/src/engine/api/geary-email-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-email-identifier.vala b/src/engine/api/geary-email-identifier.vala
index cfd1ff7..e044ab1 100644
--- a/src/engine/api/geary-email-identifier.vala
+++ b/src/engine/api/geary-email-identifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-email-properties.vala b/src/engine/api/geary-email-properties.vala
index 1a7f3d8..de9d9db 100644
--- a/src/engine/api/geary-email-properties.vala
+++ b/src/engine/api/geary-email-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-email.vala b/src/engine/api/geary-email.vala
index f2b62b4..c068d69 100644
--- a/src/engine/api/geary-email.vala
+++ b/src/engine/api/geary-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-endpoint.vala b/src/engine/api/geary-endpoint.vala
index 14ee0ea..d554bb3 100644
--- a/src/engine/api/geary-endpoint.vala
+++ b/src/engine/api/geary-endpoint.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-engine-error.vala b/src/engine/api/geary-engine-error.vala
index 7f6c954..24b2897 100644
--- a/src/engine/api/geary-engine-error.vala
+++ b/src/engine/api/geary-engine-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-engine.vala b/src/engine/api/geary-engine.vala
index 0a5ce05..c2d2938 100644
--- a/src/engine/api/geary-engine.vala
+++ b/src/engine/api/geary-engine.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-path.vala b/src/engine/api/geary-folder-path.vala
index 36a5b32..59a4afa 100644
--- a/src/engine/api/geary-folder-path.vala
+++ b/src/engine/api/geary-folder-path.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-properties.vala b/src/engine/api/geary-folder-properties.vala
index be1a24b..33c9caf 100644
--- a/src/engine/api/geary-folder-properties.vala
+++ b/src/engine/api/geary-folder-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-archive.vala 
b/src/engine/api/geary-folder-supports-archive.vala
index 91b7cac..8160273 100644
--- a/src/engine/api/geary-folder-supports-archive.vala
+++ b/src/engine/api/geary-folder-supports-archive.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-copy.vala b/src/engine/api/geary-folder-supports-copy.vala
index b8b0025..4b3be31 100644
--- a/src/engine/api/geary-folder-supports-copy.vala
+++ b/src/engine/api/geary-folder-supports-copy.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-create.vala 
b/src/engine/api/geary-folder-supports-create.vala
index ec38e97..31e2296 100644
--- a/src/engine/api/geary-folder-supports-create.vala
+++ b/src/engine/api/geary-folder-supports-create.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-empty.vala b/src/engine/api/geary-folder-supports-empty.vala
index 69f1e48..e17e0a3 100644
--- a/src/engine/api/geary-folder-supports-empty.vala
+++ b/src/engine/api/geary-folder-supports-empty.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-mark.vala b/src/engine/api/geary-folder-supports-mark.vala
index cbc07ee..3ca78c2 100644
--- a/src/engine/api/geary-folder-supports-mark.vala
+++ b/src/engine/api/geary-folder-supports-mark.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-move.vala b/src/engine/api/geary-folder-supports-move.vala
index e6c2534..a835be0 100644
--- a/src/engine/api/geary-folder-supports-move.vala
+++ b/src/engine/api/geary-folder-supports-move.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder-supports-remove.vala 
b/src/engine/api/geary-folder-supports-remove.vala
index 3e3d101..669e83a 100644
--- a/src/engine/api/geary-folder-supports-remove.vala
+++ b/src/engine/api/geary-folder-supports-remove.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-folder.vala b/src/engine/api/geary-folder.vala
index bb8abe8..63772d0 100644
--- a/src/engine/api/geary-folder.vala
+++ b/src/engine/api/geary-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-logging.vala b/src/engine/api/geary-logging.vala
index 887e69e..0ded38b 100644
--- a/src/engine/api/geary-logging.vala
+++ b/src/engine/api/geary-logging.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-named-flag.vala b/src/engine/api/geary-named-flag.vala
index 7c46d6b..b8067ed 100644
--- a/src/engine/api/geary-named-flag.vala
+++ b/src/engine/api/geary-named-flag.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-named-flags.vala b/src/engine/api/geary-named-flags.vala
index b8f49cf..4f1668d 100644
--- a/src/engine/api/geary-named-flags.vala
+++ b/src/engine/api/geary-named-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-progress-monitor.vala b/src/engine/api/geary-progress-monitor.vala
index e1db70e..f72510c 100644
--- a/src/engine/api/geary-progress-monitor.vala
+++ b/src/engine/api/geary-progress-monitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-revokable.vala b/src/engine/api/geary-revokable.vala
index 6f42737..ad35e46 100644
--- a/src/engine/api/geary-revokable.vala
+++ b/src/engine/api/geary-revokable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-search-folder.vala b/src/engine/api/geary-search-folder.vala
index af2d70d..6dadce0 100644
--- a/src/engine/api/geary-search-folder.vala
+++ b/src/engine/api/geary-search-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-search-query.vala b/src/engine/api/geary-search-query.vala
index 925d025..99de32f 100644
--- a/src/engine/api/geary-search-query.vala
+++ b/src/engine/api/geary-search-query.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-service-provider.vala b/src/engine/api/geary-service-provider.vala
index 8006f45..8eba36f 100644
--- a/src/engine/api/geary-service-provider.vala
+++ b/src/engine/api/geary-service-provider.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-service.vala b/src/engine/api/geary-service.vala
index bcad3cb..b83f28e 100644
--- a/src/engine/api/geary-service.vala
+++ b/src/engine/api/geary-service.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/api/geary-special-folder-type.vala b/src/engine/api/geary-special-folder-type.vala
index 8322ff2..c4d09f5 100644
--- a/src/engine/api/geary-special-folder-type.vala
+++ b/src/engine/api/geary-special-folder-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/app-conversation-monitor.vala b/src/engine/app/app-conversation-monitor.vala
index 12ca9d8..b906155 100644
--- a/src/engine/app/app-conversation-monitor.vala
+++ b/src/engine/app/app-conversation-monitor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/app-conversation.vala b/src/engine/app/app-conversation.vala
index a5afd8e..bb96a54 100644
--- a/src/engine/app/app-conversation.vala
+++ b/src/engine/app/app-conversation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/app-draft-manager.vala b/src/engine/app/app-draft-manager.vala
index 8838949..068ee90 100644
--- a/src/engine/app/app-draft-manager.vala
+++ b/src/engine/app/app-draft-manager.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/app-email-store.vala b/src/engine/app/app-email-store.vala
index 70a680a..312c829 100644
--- a/src/engine/app/app-email-store.vala
+++ b/src/engine/app/app-email-store.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-append-operation.vala 
b/src/engine/app/conversation-monitor/app-append-operation.vala
index 51f997e..7c97adf 100644
--- a/src/engine/app/conversation-monitor/app-append-operation.vala
+++ b/src/engine/app/conversation-monitor/app-append-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-conversation-operation-queue.vala 
b/src/engine/app/conversation-monitor/app-conversation-operation-queue.vala
index 3b026a5..caa98a7 100644
--- a/src/engine/app/conversation-monitor/app-conversation-operation-queue.vala
+++ b/src/engine/app/conversation-monitor/app-conversation-operation-queue.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-conversation-operation.vala 
b/src/engine/app/conversation-monitor/app-conversation-operation.vala
index 6d8bbf9..29f1c1d 100644
--- a/src/engine/app/conversation-monitor/app-conversation-operation.vala
+++ b/src/engine/app/conversation-monitor/app-conversation-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-conversation-set.vala 
b/src/engine/app/conversation-monitor/app-conversation-set.vala
index 1466e75..62f3aff 100644
--- a/src/engine/app/conversation-monitor/app-conversation-set.vala
+++ b/src/engine/app/conversation-monitor/app-conversation-set.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-external-append-operation.vala 
b/src/engine/app/conversation-monitor/app-external-append-operation.vala
index 9cbb05d..77d4d69 100644
--- a/src/engine/app/conversation-monitor/app-external-append-operation.vala
+++ b/src/engine/app/conversation-monitor/app-external-append-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-fill-window-operation.vala 
b/src/engine/app/conversation-monitor/app-fill-window-operation.vala
index ff5df56..9e099c2 100644
--- a/src/engine/app/conversation-monitor/app-fill-window-operation.vala
+++ b/src/engine/app/conversation-monitor/app-fill-window-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-local-load-operation.vala 
b/src/engine/app/conversation-monitor/app-local-load-operation.vala
index 61bd8ff..c2a8816 100644
--- a/src/engine/app/conversation-monitor/app-local-load-operation.vala
+++ b/src/engine/app/conversation-monitor/app-local-load-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-local-search-operation.vala 
b/src/engine/app/conversation-monitor/app-local-search-operation.vala
index 5035ddd..711e927 100644
--- a/src/engine/app/conversation-monitor/app-local-search-operation.vala
+++ b/src/engine/app/conversation-monitor/app-local-search-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-remove-operation.vala 
b/src/engine/app/conversation-monitor/app-remove-operation.vala
index 6bb633a..4b4ce57 100644
--- a/src/engine/app/conversation-monitor/app-remove-operation.vala
+++ b/src/engine/app/conversation-monitor/app-remove-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-reseed-operation.vala 
b/src/engine/app/conversation-monitor/app-reseed-operation.vala
index c546b7b..eb16e8c 100644
--- a/src/engine/app/conversation-monitor/app-reseed-operation.vala
+++ b/src/engine/app/conversation-monitor/app-reseed-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/conversation-monitor/app-terminate-operation.vala 
b/src/engine/app/conversation-monitor/app-terminate-operation.vala
index fb23be2..dd60dd5 100644
--- a/src/engine/app/conversation-monitor/app-terminate-operation.vala
+++ b/src/engine/app/conversation-monitor/app-terminate-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/email-store/app-async-folder-operation.vala 
b/src/engine/app/email-store/app-async-folder-operation.vala
index 80bc785..2210636 100644
--- a/src/engine/app/email-store/app-async-folder-operation.vala
+++ b/src/engine/app/email-store/app-async-folder-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/email-store/app-copy-operation.vala 
b/src/engine/app/email-store/app-copy-operation.vala
index ee4de66..0e36880 100644
--- a/src/engine/app/email-store/app-copy-operation.vala
+++ b/src/engine/app/email-store/app-copy-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/email-store/app-fetch-operation.vala 
b/src/engine/app/email-store/app-fetch-operation.vala
index fc4d1e5..6525493 100644
--- a/src/engine/app/email-store/app-fetch-operation.vala
+++ b/src/engine/app/email-store/app-fetch-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/email-store/app-list-operation.vala 
b/src/engine/app/email-store/app-list-operation.vala
index b707b10..d776152 100644
--- a/src/engine/app/email-store/app-list-operation.vala
+++ b/src/engine/app/email-store/app-list-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/app/email-store/app-mark-operation.vala 
b/src/engine/app/email-store/app-mark-operation.vala
index e938f40..819e237 100644
--- a/src/engine/app/email-store/app-mark-operation.vala
+++ b/src/engine/app/email-store/app-mark-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/common/common-message-data.vala b/src/engine/common/common-message-data.vala
index 91f808f..cafc68b 100644
--- a/src/engine/common/common-message-data.vala
+++ b/src/engine/common/common-message-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-connection.vala b/src/engine/db/db-connection.vala
index 4a1eabf..96c6495 100644
--- a/src/engine/db/db-connection.vala
+++ b/src/engine/db/db-connection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-context.vala b/src/engine/db/db-context.vala
index b448aca..288a7e4 100644
--- a/src/engine/db/db-context.vala
+++ b/src/engine/db/db-context.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-database-error.vala b/src/engine/db/db-database-error.vala
index 4e0bb2a..407fa5c 100644
--- a/src/engine/db/db-database-error.vala
+++ b/src/engine/db/db-database-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-database.vala b/src/engine/db/db-database.vala
index 0db1f83..b3989d4 100644
--- a/src/engine/db/db-database.vala
+++ b/src/engine/db/db-database.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-result.vala b/src/engine/db/db-result.vala
index 0caa6ff..400d0b1 100644
--- a/src/engine/db/db-result.vala
+++ b/src/engine/db/db-result.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-statement.vala b/src/engine/db/db-statement.vala
index f50f776..9bab255 100644
--- a/src/engine/db/db-statement.vala
+++ b/src/engine/db/db-statement.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-synchronous-mode.vala b/src/engine/db/db-synchronous-mode.vala
index 3f38c71..c945e22 100644
--- a/src/engine/db/db-synchronous-mode.vala
+++ b/src/engine/db/db-synchronous-mode.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-transaction-async-job.vala b/src/engine/db/db-transaction-async-job.vala
index 85571ce..8debae3 100644
--- a/src/engine/db/db-transaction-async-job.vala
+++ b/src/engine/db/db-transaction-async-job.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-transaction-outcome.vala b/src/engine/db/db-transaction-outcome.vala
index 830eb90..ede38c8 100644
--- a/src/engine/db/db-transaction-outcome.vala
+++ b/src/engine/db/db-transaction-outcome.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-transaction-type.vala b/src/engine/db/db-transaction-type.vala
index 35a267f..7548de7 100644
--- a/src/engine/db/db-transaction-type.vala
+++ b/src/engine/db/db-transaction-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db-versioned-database.vala b/src/engine/db/db-versioned-database.vala
index d10d3d4..e3d2029 100644
--- a/src/engine/db/db-versioned-database.vala
+++ b/src/engine/db/db-versioned-database.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/db/db.vala b/src/engine/db/db.vala
index 14dddbf..f423166 100644
--- a/src/engine/db/db.vala
+++ b/src/engine/db/db.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-account.vala b/src/engine/imap-db/imap-db-account.vala
index 30cad85..17b2c2c 100644
--- a/src/engine/imap-db/imap-db-account.vala
+++ b/src/engine/imap-db/imap-db-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-attachment.vala b/src/engine/imap-db/imap-db-attachment.vala
index bc59fd7..75347f6 100644
--- a/src/engine/imap-db/imap-db-attachment.vala
+++ b/src/engine/imap-db/imap-db-attachment.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-contact.vala b/src/engine/imap-db/imap-db-contact.vala
index ebd6d12..d6967ee 100644
--- a/src/engine/imap-db/imap-db-contact.vala
+++ b/src/engine/imap-db/imap-db-contact.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-database.vala b/src/engine/imap-db/imap-db-database.vala
index 2dfdc33..8fff480 100644
--- a/src/engine/imap-db/imap-db-database.vala
+++ b/src/engine/imap-db/imap-db-database.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-email-identifier.vala 
b/src/engine/imap-db/imap-db-email-identifier.vala
index 3fb20f4..5f0fb0e 100644
--- a/src/engine/imap-db/imap-db-email-identifier.vala
+++ b/src/engine/imap-db/imap-db-email-identifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-folder.vala b/src/engine/imap-db/imap-db-folder.vala
index 4a00264..a38318d 100644
--- a/src/engine/imap-db/imap-db-folder.vala
+++ b/src/engine/imap-db/imap-db-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-gc.vala b/src/engine/imap-db/imap-db-gc.vala
index bba994f..0ba6227 100644
--- a/src/engine/imap-db/imap-db-gc.vala
+++ b/src/engine/imap-db/imap-db-gc.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-message-addresses.vala 
b/src/engine/imap-db/imap-db-message-addresses.vala
index b9d51b7..7800b09 100644
--- a/src/engine/imap-db/imap-db-message-addresses.vala
+++ b/src/engine/imap-db/imap-db-message-addresses.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/imap-db-message-row.vala b/src/engine/imap-db/imap-db-message-row.vala
index c56aa2f..291b83c 100644
--- a/src/engine/imap-db/imap-db-message-row.vala
+++ b/src/engine/imap-db/imap-db-message-row.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala 
b/src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala
index 5238d7b..2500acc 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-email-identifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/outbox/smtp-outbox-email-properties.vala 
b/src/engine/imap-db/outbox/smtp-outbox-email-properties.vala
index be579e5..a0e0dcb 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-email-properties.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-email-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala
index 057a44e..6d1af22 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder-root.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder-root.vala
index 701cfcd..d110cc1 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder-root.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder-root.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/outbox/smtp-outbox-folder.vala 
b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
index ab7ca0a..da79dbc 100644
--- a/src/engine/imap-db/outbox/smtp-outbox-folder.vala
+++ b/src/engine/imap-db/outbox/smtp-outbox-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-email-identifier.vala 
b/src/engine/imap-db/search/imap-db-search-email-identifier.vala
index 6df1bef..a8b6e7c 100644
--- a/src/engine/imap-db/search/imap-db-search-email-identifier.vala
+++ b/src/engine/imap-db/search/imap-db-search-email-identifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-folder-properties.vala 
b/src/engine/imap-db/search/imap-db-search-folder-properties.vala
index 4b64823..13f8412 100644
--- a/src/engine/imap-db/search/imap-db-search-folder-properties.vala
+++ b/src/engine/imap-db/search/imap-db-search-folder-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-folder-root.vala 
b/src/engine/imap-db/search/imap-db-search-folder-root.vala
index f1094fa..98be1d9 100644
--- a/src/engine/imap-db/search/imap-db-search-folder-root.vala
+++ b/src/engine/imap-db/search/imap-db-search-folder-root.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-folder.vala 
b/src/engine/imap-db/search/imap-db-search-folder.vala
index a48631f..0e5b084 100644
--- a/src/engine/imap-db/search/imap-db-search-folder.vala
+++ b/src/engine/imap-db/search/imap-db-search-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-query.vala 
b/src/engine/imap-db/search/imap-db-search-query.vala
index 884fb22..f9aeae7 100644
--- a/src/engine/imap-db/search/imap-db-search-query.vala
+++ b/src/engine/imap-db/search/imap-db-search-query.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-db/search/imap-db-search-term.vala 
b/src/engine/imap-db/search/imap-db-search-term.vala
index 6009336..4d2e440 100644
--- a/src/engine/imap-db/search/imap-db-search-term.vala
+++ b/src/engine/imap-db/search/imap-db-search-term.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
index 71c7742..050913b 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-all-mail-folder.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-all-mail-folder.vala
index ce46e75..612c55f 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-all-mail-folder.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-all-mail-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-drafts-folder.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-drafts-folder.vala
index 57ea1df..897bf64 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-drafts-folder.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-drafts-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala
index a046ab9..2579e29 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala
index d71d2ae..b009bcc 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-search-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/gmail/imap-engine-gmail-spam-trash-folder.vala 
b/src/engine/imap-engine/gmail/imap-engine-gmail-spam-trash-folder.vala
index e9bb552..e450c0c 100644
--- a/src/engine/imap-engine/gmail/imap-engine-gmail-spam-trash-folder.vala
+++ b/src/engine/imap-engine/gmail/imap-engine-gmail-spam-trash-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-account-synchronizer.vala 
b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
index a6c70e6..c4d8fd7 100644
--- a/src/engine/imap-engine/imap-engine-account-synchronizer.vala
+++ b/src/engine/imap-engine/imap-engine-account-synchronizer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-batch-operations.vala 
b/src/engine/imap-engine/imap-engine-batch-operations.vala
index d684046..6733f13 100644
--- a/src/engine/imap-engine/imap-engine-batch-operations.vala
+++ b/src/engine/imap-engine/imap-engine-batch-operations.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-contact-store.vala 
b/src/engine/imap-engine/imap-engine-contact-store.vala
index fde0260..1687aec 100644
--- a/src/engine/imap-engine/imap-engine-contact-store.vala
+++ b/src/engine/imap-engine/imap-engine-contact-store.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-email-flag-watcher.vala 
b/src/engine/imap-engine/imap-engine-email-flag-watcher.vala
index 6455e30..beb86e4 100644
--- a/src/engine/imap-engine/imap-engine-email-flag-watcher.vala
+++ b/src/engine/imap-engine/imap-engine-email-flag-watcher.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-email-prefetcher.vala 
b/src/engine/imap-engine/imap-engine-email-prefetcher.vala
index b2707c8..367f1d9 100644
--- a/src/engine/imap-engine/imap-engine-email-prefetcher.vala
+++ b/src/engine/imap-engine/imap-engine-email-prefetcher.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-generic-account.vala 
b/src/engine/imap-engine/imap-engine-generic-account.vala
index 65ef91c..69f4fc1 100644
--- a/src/engine/imap-engine/imap-engine-generic-account.vala
+++ b/src/engine/imap-engine/imap-engine-generic-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-generic-folder.vala 
b/src/engine/imap-engine/imap-engine-generic-folder.vala
index f367cd3..176df06 100644
--- a/src/engine/imap-engine/imap-engine-generic-folder.vala
+++ b/src/engine/imap-engine/imap-engine-generic-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-minimal-folder.vala 
b/src/engine/imap-engine/imap-engine-minimal-folder.vala
index d146de6..8d8ba83 100644
--- a/src/engine/imap-engine/imap-engine-minimal-folder.vala
+++ b/src/engine/imap-engine/imap-engine-minimal-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-replay-operation.vala 
b/src/engine/imap-engine/imap-engine-replay-operation.vala
index 7c97087..eb1aef4 100644
--- a/src/engine/imap-engine/imap-engine-replay-operation.vala
+++ b/src/engine/imap-engine/imap-engine-replay-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-replay-queue.vala 
b/src/engine/imap-engine/imap-engine-replay-queue.vala
index ffb5b53..be4056f 100644
--- a/src/engine/imap-engine/imap-engine-replay-queue.vala
+++ b/src/engine/imap-engine/imap-engine-replay-queue.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-revokable-committed-move.vala 
b/src/engine/imap-engine/imap-engine-revokable-committed-move.vala
index b07f7e5..3ac60dc 100644
--- a/src/engine/imap-engine/imap-engine-revokable-committed-move.vala
+++ b/src/engine/imap-engine/imap-engine-revokable-committed-move.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-revokable-move.vala 
b/src/engine/imap-engine/imap-engine-revokable-move.vala
index f8ecee5..594697b 100644
--- a/src/engine/imap-engine/imap-engine-revokable-move.vala
+++ b/src/engine/imap-engine/imap-engine-revokable-move.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine-send-replay-operation.vala 
b/src/engine/imap-engine/imap-engine-send-replay-operation.vala
index 1783f24..90d9d9c 100644
--- a/src/engine/imap-engine/imap-engine-send-replay-operation.vala
+++ b/src/engine/imap-engine/imap-engine-send-replay-operation.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/imap-engine.vala b/src/engine/imap-engine/imap-engine.vala
index 38d6afd..967d778 100644
--- a/src/engine/imap-engine/imap-engine.vala
+++ b/src/engine/imap-engine/imap-engine.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/other/imap-engine-other-account.vala 
b/src/engine/imap-engine/other/imap-engine-other-account.vala
index e4e5bdc..934e0ca 100644
--- a/src/engine/imap-engine/other/imap-engine-other-account.vala
+++ b/src/engine/imap-engine/other/imap-engine-other-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/other/imap-engine-other-folder.vala 
b/src/engine/imap-engine/other/imap-engine-other-folder.vala
index 272d2b9..882131f 100644
--- a/src/engine/imap-engine/other/imap-engine-other-folder.vala
+++ b/src/engine/imap-engine/other/imap-engine-other-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/outlook/imap-engine-outlook-account.vala 
b/src/engine/imap-engine/outlook/imap-engine-outlook-account.vala
index ebc2d03..1ac43bf 100644
--- a/src/engine/imap-engine/outlook/imap-engine-outlook-account.vala
+++ b/src/engine/imap-engine/outlook/imap-engine-outlook-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala 
b/src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala
index 804bd28..14a21e3 100644
--- a/src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala
+++ b/src/engine/imap-engine/outlook/imap-engine-outlook-drafts-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala 
b/src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala
index 5ec5da8..7e5dc2e 100644
--- a/src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala
+++ b/src/engine/imap-engine/outlook/imap-engine-outlook-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
index 7338885..22056d2 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-abstract-list-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala
index c09129d..bcf1b66 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-copy-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-create-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-create-email.vala
index 5e81294..d62ea7d 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-create-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-create-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-empty-folder.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-empty-folder.vala
index 05aedb4..b0d9adf 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-empty-folder.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-empty-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala
index 6cfdf27..580a41d 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-fetch-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
index 10a35a5..ab3f0e2 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-id.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala
index 9432cb0..81e9538 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-list-email-by-sparse-id.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
index ba5d339..21968c8 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-mark-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-move-email-commit.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-move-email-commit.vala
index 70d830c..94e719f 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-move-email-commit.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-move-email-commit.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-move-email-prepare.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-move-email-prepare.vala
index 2817e38..30b1875 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-move-email-prepare.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-move-email-prepare.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-move-email-revoke.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-move-email-revoke.vala
index 896596a..b9a010d 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-move-email-revoke.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-move-email-revoke.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala
index 990906d..03e944f 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-remove-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
index 4dcc362..7a271e5 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-append.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
index 2cc66f8..238759e 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-disconnect.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
index cdc4366..0f5d6a9 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-replay-removal.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala
index df42a8d..3984961 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-server-search-email.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/replay-ops/imap-engine-user-close.vala 
b/src/engine/imap-engine/replay-ops/imap-engine-user-close.vala
index 00a53b8..52b381a 100644
--- a/src/engine/imap-engine/replay-ops/imap-engine-user-close.vala
+++ b/src/engine/imap-engine/replay-ops/imap-engine-user-close.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala 
b/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala
index 2e5dfae..db83f5c 100644
--- a/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala
+++ b/src/engine/imap-engine/yahoo/imap-engine-yahoo-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala 
b/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala
index bec163f..0a08ae3 100644
--- a/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala
+++ b/src/engine/imap-engine/yahoo/imap-engine-yahoo-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-account.vala b/src/engine/imap/api/imap-account.vala
index f49909c..f929dc4 100644
--- a/src/engine/imap/api/imap-account.vala
+++ b/src/engine/imap/api/imap-account.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-email-flags.vala b/src/engine/imap/api/imap-email-flags.vala
index 9eaf8c1..ee0d3ef 100644
--- a/src/engine/imap/api/imap-email-flags.vala
+++ b/src/engine/imap/api/imap-email-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-email-properties.vala b/src/engine/imap/api/imap-email-properties.vala
index 78fcb77..b1a1937 100644
--- a/src/engine/imap/api/imap-email-properties.vala
+++ b/src/engine/imap/api/imap-email-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-folder-properties.vala b/src/engine/imap/api/imap-folder-properties.vala
index 14371ea..cad69aa 100644
--- a/src/engine/imap/api/imap-folder-properties.vala
+++ b/src/engine/imap/api/imap-folder-properties.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-folder-root.vala b/src/engine/imap/api/imap-folder-root.vala
index 2d397f9..e19a4a1 100644
--- a/src/engine/imap/api/imap-folder-root.vala
+++ b/src/engine/imap/api/imap-folder-root.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/api/imap-folder.vala b/src/engine/imap/api/imap-folder.vala
index e802c8c..d74daaf 100644
--- a/src/engine/imap/api/imap-folder.vala
+++ b/src/engine/imap/api/imap-folder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-append-command.vala 
b/src/engine/imap/command/imap-append-command.vala
index 85945dc..9c06eca 100644
--- a/src/engine/imap/command/imap-append-command.vala
+++ b/src/engine/imap/command/imap-append-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-capability-command.vala 
b/src/engine/imap/command/imap-capability-command.vala
index 56a33e2..8785bfa 100644
--- a/src/engine/imap/command/imap-capability-command.vala
+++ b/src/engine/imap/command/imap-capability-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-close-command.vala b/src/engine/imap/command/imap-close-command.vala
index 83fdade..1026d41 100644
--- a/src/engine/imap/command/imap-close-command.vala
+++ b/src/engine/imap/command/imap-close-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-command.vala b/src/engine/imap/command/imap-command.vala
index ba9130d..9811a01 100644
--- a/src/engine/imap/command/imap-command.vala
+++ b/src/engine/imap/command/imap-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-compress-command.vala 
b/src/engine/imap/command/imap-compress-command.vala
index aea06e4..1c15031 100644
--- a/src/engine/imap/command/imap-compress-command.vala
+++ b/src/engine/imap/command/imap-compress-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-copy-command.vala b/src/engine/imap/command/imap-copy-command.vala
index 3b8fb32..1ae1472 100644
--- a/src/engine/imap/command/imap-copy-command.vala
+++ b/src/engine/imap/command/imap-copy-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-create-command.vala 
b/src/engine/imap/command/imap-create-command.vala
index 576a419..5b5998d 100644
--- a/src/engine/imap/command/imap-create-command.vala
+++ b/src/engine/imap/command/imap-create-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-examine-command.vala 
b/src/engine/imap/command/imap-examine-command.vala
index 267c3d4..2800b75 100644
--- a/src/engine/imap/command/imap-examine-command.vala
+++ b/src/engine/imap/command/imap-examine-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-expunge-command.vala 
b/src/engine/imap/command/imap-expunge-command.vala
index 41c7423..2e132ac 100644
--- a/src/engine/imap/command/imap-expunge-command.vala
+++ b/src/engine/imap/command/imap-expunge-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-fetch-command.vala b/src/engine/imap/command/imap-fetch-command.vala
index e91f684..3bcaa1b 100644
--- a/src/engine/imap/command/imap-fetch-command.vala
+++ b/src/engine/imap/command/imap-fetch-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-id-command.vala b/src/engine/imap/command/imap-id-command.vala
index d19296f..44aad57 100644
--- a/src/engine/imap/command/imap-id-command.vala
+++ b/src/engine/imap/command/imap-id-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-idle-command.vala b/src/engine/imap/command/imap-idle-command.vala
index 1ef6cf3..e781b24 100644
--- a/src/engine/imap/command/imap-idle-command.vala
+++ b/src/engine/imap/command/imap-idle-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-list-command.vala b/src/engine/imap/command/imap-list-command.vala
index 8999f4b..3ae4967 100644
--- a/src/engine/imap/command/imap-list-command.vala
+++ b/src/engine/imap/command/imap-list-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-list-return-parameter.vala 
b/src/engine/imap/command/imap-list-return-parameter.vala
index 0573a56..e4207c6 100644
--- a/src/engine/imap/command/imap-list-return-parameter.vala
+++ b/src/engine/imap/command/imap-list-return-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-login-command.vala b/src/engine/imap/command/imap-login-command.vala
index 9d59b1a..5eb324b 100644
--- a/src/engine/imap/command/imap-login-command.vala
+++ b/src/engine/imap/command/imap-login-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-logout-command.vala 
b/src/engine/imap/command/imap-logout-command.vala
index 8c1ebf5..ffc4060 100644
--- a/src/engine/imap/command/imap-logout-command.vala
+++ b/src/engine/imap/command/imap-logout-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-message-set.vala b/src/engine/imap/command/imap-message-set.vala
index 107e696..d795103 100644
--- a/src/engine/imap/command/imap-message-set.vala
+++ b/src/engine/imap/command/imap-message-set.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-noop-command.vala b/src/engine/imap/command/imap-noop-command.vala
index 565cd4f..9884a32 100644
--- a/src/engine/imap/command/imap-noop-command.vala
+++ b/src/engine/imap/command/imap-noop-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-search-command.vala 
b/src/engine/imap/command/imap-search-command.vala
index 784e3da..23cf29a 100644
--- a/src/engine/imap/command/imap-search-command.vala
+++ b/src/engine/imap/command/imap-search-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-search-criteria.vala 
b/src/engine/imap/command/imap-search-criteria.vala
index 77b279f..67c0d60 100644
--- a/src/engine/imap/command/imap-search-criteria.vala
+++ b/src/engine/imap/command/imap-search-criteria.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-search-criterion.vala 
b/src/engine/imap/command/imap-search-criterion.vala
index eeaf5ff..7f0d8cb 100644
--- a/src/engine/imap/command/imap-search-criterion.vala
+++ b/src/engine/imap/command/imap-search-criterion.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-select-command.vala 
b/src/engine/imap/command/imap-select-command.vala
index 9df4ccf..3eaa73a 100644
--- a/src/engine/imap/command/imap-select-command.vala
+++ b/src/engine/imap/command/imap-select-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-starttls-command.vala 
b/src/engine/imap/command/imap-starttls-command.vala
index fb391e5..48a9d4b 100644
--- a/src/engine/imap/command/imap-starttls-command.vala
+++ b/src/engine/imap/command/imap-starttls-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-status-command.vala 
b/src/engine/imap/command/imap-status-command.vala
index 83cb2e6..0066851 100644
--- a/src/engine/imap/command/imap-status-command.vala
+++ b/src/engine/imap/command/imap-status-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/command/imap-store-command.vala b/src/engine/imap/command/imap-store-command.vala
index aaa21a8..e1dc056 100644
--- a/src/engine/imap/command/imap-store-command.vala
+++ b/src/engine/imap/command/imap-store-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/imap-error.vala b/src/engine/imap/imap-error.vala
index c961f14..66fe965 100644
--- a/src/engine/imap/imap-error.vala
+++ b/src/engine/imap/imap-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/imap.vala b/src/engine/imap/imap.vala
index b1e3ada..c52866e 100644
--- a/src/engine/imap/imap.vala
+++ b/src/engine/imap/imap.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-data-format.vala b/src/engine/imap/message/imap-data-format.vala
index 20f6054..64879af 100644
--- a/src/engine/imap/message/imap-data-format.vala
+++ b/src/engine/imap/message/imap-data-format.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-envelope.vala b/src/engine/imap/message/imap-envelope.vala
index 44500c6..5a471de 100644
--- a/src/engine/imap/message/imap-envelope.vala
+++ b/src/engine/imap/message/imap-envelope.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-fetch-body-data-specifier.vala 
b/src/engine/imap/message/imap-fetch-body-data-specifier.vala
index 7f98fab..b2dda65 100644
--- a/src/engine/imap/message/imap-fetch-body-data-specifier.vala
+++ b/src/engine/imap/message/imap-fetch-body-data-specifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-fetch-data-specifier.vala 
b/src/engine/imap/message/imap-fetch-data-specifier.vala
index 2bbcdc0..d9e3849 100644
--- a/src/engine/imap/message/imap-fetch-data-specifier.vala
+++ b/src/engine/imap/message/imap-fetch-data-specifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-flag.vala b/src/engine/imap/message/imap-flag.vala
index 345253a..c26f59f 100644
--- a/src/engine/imap/message/imap-flag.vala
+++ b/src/engine/imap/message/imap-flag.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-flags.vala b/src/engine/imap/message/imap-flags.vala
index 131a3a0..4ec6706 100644
--- a/src/engine/imap/message/imap-flags.vala
+++ b/src/engine/imap/message/imap-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-internal-date.vala b/src/engine/imap/message/imap-internal-date.vala
index beb854f..cc12a2d 100644
--- a/src/engine/imap/message/imap-internal-date.vala
+++ b/src/engine/imap/message/imap-internal-date.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-mailbox-parameter.vala 
b/src/engine/imap/message/imap-mailbox-parameter.vala
index 8dcb190..7447a85 100644
--- a/src/engine/imap/message/imap-mailbox-parameter.vala
+++ b/src/engine/imap/message/imap-mailbox-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-mailbox-specifier.vala 
b/src/engine/imap/message/imap-mailbox-specifier.vala
index b9fdbbf..d675895 100644
--- a/src/engine/imap/message/imap-mailbox-specifier.vala
+++ b/src/engine/imap/message/imap-mailbox-specifier.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-message-data.vala b/src/engine/imap/message/imap-message-data.vala
index 19c743f..e4d423f 100644
--- a/src/engine/imap/message/imap-message-data.vala
+++ b/src/engine/imap/message/imap-message-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-message-flag.vala b/src/engine/imap/message/imap-message-flag.vala
index 753a891..5a73c5d 100644
--- a/src/engine/imap/message/imap-message-flag.vala
+++ b/src/engine/imap/message/imap-message-flag.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-message-flags.vala b/src/engine/imap/message/imap-message-flags.vala
index f3da364..281477e 100644
--- a/src/engine/imap/message/imap-message-flags.vala
+++ b/src/engine/imap/message/imap-message-flags.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-sequence-number.vala 
b/src/engine/imap/message/imap-sequence-number.vala
index 7de206f..d14d15a 100644
--- a/src/engine/imap/message/imap-sequence-number.vala
+++ b/src/engine/imap/message/imap-sequence-number.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-status-data-type.vala 
b/src/engine/imap/message/imap-status-data-type.vala
index 292b4f6..bebb37a 100644
--- a/src/engine/imap/message/imap-status-data-type.vala
+++ b/src/engine/imap/message/imap-status-data-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-tag.vala b/src/engine/imap/message/imap-tag.vala
index ce62add..10c53f0 100644
--- a/src/engine/imap/message/imap-tag.vala
+++ b/src/engine/imap/message/imap-tag.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-uid-validity.vala b/src/engine/imap/message/imap-uid-validity.vala
index 4c53e06..400d84b 100644
--- a/src/engine/imap/message/imap-uid-validity.vala
+++ b/src/engine/imap/message/imap-uid-validity.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/message/imap-uid.vala b/src/engine/imap/message/imap-uid.vala
index 1796e72..d2270de 100644
--- a/src/engine/imap/message/imap-uid.vala
+++ b/src/engine/imap/message/imap-uid.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-atom-parameter.vala 
b/src/engine/imap/parameter/imap-atom-parameter.vala
index 343997e..7e5bbee 100644
--- a/src/engine/imap/parameter/imap-atom-parameter.vala
+++ b/src/engine/imap/parameter/imap-atom-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-list-parameter.vala 
b/src/engine/imap/parameter/imap-list-parameter.vala
index 8ca8e68..71dfd1e 100644
--- a/src/engine/imap/parameter/imap-list-parameter.vala
+++ b/src/engine/imap/parameter/imap-list-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-literal-parameter.vala 
b/src/engine/imap/parameter/imap-literal-parameter.vala
index 99ffea8..9bdcbb0 100644
--- a/src/engine/imap/parameter/imap-literal-parameter.vala
+++ b/src/engine/imap/parameter/imap-literal-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-nil-parameter.vala 
b/src/engine/imap/parameter/imap-nil-parameter.vala
index cc43af2..119d998 100644
--- a/src/engine/imap/parameter/imap-nil-parameter.vala
+++ b/src/engine/imap/parameter/imap-nil-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-number-parameter.vala 
b/src/engine/imap/parameter/imap-number-parameter.vala
index 5884565..37391fa 100644
--- a/src/engine/imap/parameter/imap-number-parameter.vala
+++ b/src/engine/imap/parameter/imap-number-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-parameter.vala b/src/engine/imap/parameter/imap-parameter.vala
index ec8039d..484fde9 100644
--- a/src/engine/imap/parameter/imap-parameter.vala
+++ b/src/engine/imap/parameter/imap-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-quoted-string-parameter.vala 
b/src/engine/imap/parameter/imap-quoted-string-parameter.vala
index 5796dcc..c61cc05 100644
--- a/src/engine/imap/parameter/imap-quoted-string-parameter.vala
+++ b/src/engine/imap/parameter/imap-quoted-string-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-root-parameters.vala 
b/src/engine/imap/parameter/imap-root-parameters.vala
index 4e03d8c..347bf1c 100644
--- a/src/engine/imap/parameter/imap-root-parameters.vala
+++ b/src/engine/imap/parameter/imap-root-parameters.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-string-parameter.vala 
b/src/engine/imap/parameter/imap-string-parameter.vala
index 4be91e7..aee3553 100644
--- a/src/engine/imap/parameter/imap-string-parameter.vala
+++ b/src/engine/imap/parameter/imap-string-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/parameter/imap-unquoted-string-parameter.vala 
b/src/engine/imap/parameter/imap-unquoted-string-parameter.vala
index 26ecf80..0ac5892 100644
--- a/src/engine/imap/parameter/imap-unquoted-string-parameter.vala
+++ b/src/engine/imap/parameter/imap-unquoted-string-parameter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-capabilities.vala b/src/engine/imap/response/imap-capabilities.vala
index 8fdf1db..3d3eef8 100644
--- a/src/engine/imap/response/imap-capabilities.vala
+++ b/src/engine/imap/response/imap-capabilities.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-continuation-response.vala 
b/src/engine/imap/response/imap-continuation-response.vala
index 0b5ebf6..82fe22e 100644
--- a/src/engine/imap/response/imap-continuation-response.vala
+++ b/src/engine/imap/response/imap-continuation-response.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-fetch-data-decoder.vala 
b/src/engine/imap/response/imap-fetch-data-decoder.vala
index 31e200f..ed94ed3 100644
--- a/src/engine/imap/response/imap-fetch-data-decoder.vala
+++ b/src/engine/imap/response/imap-fetch-data-decoder.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-fetched-data.vala b/src/engine/imap/response/imap-fetched-data.vala
index 4b749b9..114aa89 100644
--- a/src/engine/imap/response/imap-fetched-data.vala
+++ b/src/engine/imap/response/imap-fetched-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution. 
diff --git a/src/engine/imap/response/imap-mailbox-attribute.vala 
b/src/engine/imap/response/imap-mailbox-attribute.vala
index f701919..845fbd4 100644
--- a/src/engine/imap/response/imap-mailbox-attribute.vala
+++ b/src/engine/imap/response/imap-mailbox-attribute.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-mailbox-attributes.vala 
b/src/engine/imap/response/imap-mailbox-attributes.vala
index 5a84e5b..18dc562 100644
--- a/src/engine/imap/response/imap-mailbox-attributes.vala
+++ b/src/engine/imap/response/imap-mailbox-attributes.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-mailbox-information.vala 
b/src/engine/imap/response/imap-mailbox-information.vala
index c7355ed..eb331c1 100644
--- a/src/engine/imap/response/imap-mailbox-information.vala
+++ b/src/engine/imap/response/imap-mailbox-information.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution. 
diff --git a/src/engine/imap/response/imap-response-code-type.vala 
b/src/engine/imap/response/imap-response-code-type.vala
index 11c0b40..79cf75a 100644
--- a/src/engine/imap/response/imap-response-code-type.vala
+++ b/src/engine/imap/response/imap-response-code-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-response-code.vala 
b/src/engine/imap/response/imap-response-code.vala
index 07a2399..7299a19 100644
--- a/src/engine/imap/response/imap-response-code.vala
+++ b/src/engine/imap/response/imap-response-code.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-server-data-type.vala 
b/src/engine/imap/response/imap-server-data-type.vala
index e3289e1..f2ff5f5 100644
--- a/src/engine/imap/response/imap-server-data-type.vala
+++ b/src/engine/imap/response/imap-server-data-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-server-data.vala b/src/engine/imap/response/imap-server-data.vala
index 078fbee..7c1e2c3 100644
--- a/src/engine/imap/response/imap-server-data.vala
+++ b/src/engine/imap/response/imap-server-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-server-response.vala 
b/src/engine/imap/response/imap-server-response.vala
index 65ac596..4356519 100644
--- a/src/engine/imap/response/imap-server-response.vala
+++ b/src/engine/imap/response/imap-server-response.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-status-data.vala b/src/engine/imap/response/imap-status-data.vala
index 5aa7d99..81a31a3 100644
--- a/src/engine/imap/response/imap-status-data.vala
+++ b/src/engine/imap/response/imap-status-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-status-response.vala 
b/src/engine/imap/response/imap-status-response.vala
index d1906dc..1bf3b74 100644
--- a/src/engine/imap/response/imap-status-response.vala
+++ b/src/engine/imap/response/imap-status-response.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/response/imap-status.vala b/src/engine/imap/response/imap-status.vala
index 9ce0e30..fb1fe6e 100644
--- a/src/engine/imap/response/imap-status.vala
+++ b/src/engine/imap/response/imap-status.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/transport/imap-client-connection.vala 
b/src/engine/imap/transport/imap-client-connection.vala
index 43cafa7..b61b38e 100644
--- a/src/engine/imap/transport/imap-client-connection.vala
+++ b/src/engine/imap/transport/imap-client-connection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/transport/imap-client-session-manager.vala 
b/src/engine/imap/transport/imap-client-session-manager.vala
index c4f577d..34405ba 100644
--- a/src/engine/imap/transport/imap-client-session-manager.vala
+++ b/src/engine/imap/transport/imap-client-session-manager.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/transport/imap-client-session.vala 
b/src/engine/imap/transport/imap-client-session.vala
index f715ae4..e4896bc 100644
--- a/src/engine/imap/transport/imap-client-session.vala
+++ b/src/engine/imap/transport/imap-client-session.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/transport/imap-deserializer.vala 
b/src/engine/imap/transport/imap-deserializer.vala
index 512ecad..ec41764 100644
--- a/src/engine/imap/transport/imap-deserializer.vala
+++ b/src/engine/imap/transport/imap-deserializer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/imap/transport/imap-serializer.vala b/src/engine/imap/transport/imap-serializer.vala
index 9db4ad3..78696d6 100644
--- a/src/engine/imap/transport/imap-serializer.vala
+++ b/src/engine/imap/transport/imap-serializer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-buffer.vala b/src/engine/memory/memory-buffer.vala
index c9c5c1b..eb32dc0 100644
--- a/src/engine/memory/memory-buffer.vala
+++ b/src/engine/memory/memory-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-byte-buffer.vala b/src/engine/memory/memory-byte-buffer.vala
index d77e512..e5c8c43 100644
--- a/src/engine/memory/memory-byte-buffer.vala
+++ b/src/engine/memory/memory-byte-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-empty-buffer.vala b/src/engine/memory/memory-empty-buffer.vala
index fc8d12f..e7bc7cd 100644
--- a/src/engine/memory/memory-empty-buffer.vala
+++ b/src/engine/memory/memory-empty-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-file-buffer.vala b/src/engine/memory/memory-file-buffer.vala
index 1333413..90aac5f 100644
--- a/src/engine/memory/memory-file-buffer.vala
+++ b/src/engine/memory/memory-file-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-growable-buffer.vala b/src/engine/memory/memory-growable-buffer.vala
index 225c9a9..20c680c 100644
--- a/src/engine/memory/memory-growable-buffer.vala
+++ b/src/engine/memory/memory-growable-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-offset-buffer.vala b/src/engine/memory/memory-offset-buffer.vala
index bb78643..9f11b40 100644
--- a/src/engine/memory/memory-offset-buffer.vala
+++ b/src/engine/memory/memory-offset-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-string-buffer.vala b/src/engine/memory/memory-string-buffer.vala
index 5635f65..7f2a463 100644
--- a/src/engine/memory/memory-string-buffer.vala
+++ b/src/engine/memory/memory-string-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-unowned-byte-array-buffer.vala 
b/src/engine/memory/memory-unowned-byte-array-buffer.vala
index 96f9eda..3de8ec2 100644
--- a/src/engine/memory/memory-unowned-byte-array-buffer.vala
+++ b/src/engine/memory/memory-unowned-byte-array-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-unowned-bytes-buffer.vala 
b/src/engine/memory/memory-unowned-bytes-buffer.vala
index 8739a9e..fc70ce2 100644
--- a/src/engine/memory/memory-unowned-bytes-buffer.vala
+++ b/src/engine/memory/memory-unowned-bytes-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/memory/memory-unowned-string-buffer.vala 
b/src/engine/memory/memory-unowned-string-buffer.vala
index 6701147..95f208a 100644
--- a/src/engine/memory/memory-unowned-string-buffer.vala
+++ b/src/engine/memory/memory-unowned-string-buffer.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-content-disposition.vala b/src/engine/mime/mime-content-disposition.vala
index a68fb45..d8a54f0 100644
--- a/src/engine/mime/mime-content-disposition.vala
+++ b/src/engine/mime/mime-content-disposition.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-content-parameters.vala b/src/engine/mime/mime-content-parameters.vala
index 28b23f0..71e579e 100644
--- a/src/engine/mime/mime-content-parameters.vala
+++ b/src/engine/mime/mime-content-parameters.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-content-type.vala b/src/engine/mime/mime-content-type.vala
index f2339a4..397c0f2 100644
--- a/src/engine/mime/mime-content-type.vala
+++ b/src/engine/mime/mime-content-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-data-format.vala b/src/engine/mime/mime-data-format.vala
index 7df3d04..276d59b 100644
--- a/src/engine/mime/mime-data-format.vala
+++ b/src/engine/mime/mime-data-format.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-disposition-type.vala b/src/engine/mime/mime-disposition-type.vala
index 0dbcf93..18e27b2 100644
--- a/src/engine/mime/mime-disposition-type.vala
+++ b/src/engine/mime/mime-disposition-type.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-error.vala b/src/engine/mime/mime-error.vala
index 639f17b..31814fe 100644
--- a/src/engine/mime/mime-error.vala
+++ b/src/engine/mime/mime-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/mime/mime-multipart-subtype.vala b/src/engine/mime/mime-multipart-subtype.vala
index 9f216c9..4de09a3 100644
--- a/src/engine/mime/mime-multipart-subtype.vala
+++ b/src/engine/mime/mime-multipart-subtype.vala
@@ -1,4 +1,4 @@
-/* Copyright 2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-abstract-semaphore.vala 
b/src/engine/nonblocking/nonblocking-abstract-semaphore.vala
index 433def1..e595d0f 100644
--- a/src/engine/nonblocking/nonblocking-abstract-semaphore.vala
+++ b/src/engine/nonblocking/nonblocking-abstract-semaphore.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-batch.vala b/src/engine/nonblocking/nonblocking-batch.vala
index a9690ac..2eb4453 100644
--- a/src/engine/nonblocking/nonblocking-batch.vala
+++ b/src/engine/nonblocking/nonblocking-batch.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-concurrent.vala 
b/src/engine/nonblocking/nonblocking-concurrent.vala
index ad3466f..cdc2a4c 100644
--- a/src/engine/nonblocking/nonblocking-concurrent.vala
+++ b/src/engine/nonblocking/nonblocking-concurrent.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-counting-semaphore.vala 
b/src/engine/nonblocking/nonblocking-counting-semaphore.vala
index b0ea6d3..5380384 100644
--- a/src/engine/nonblocking/nonblocking-counting-semaphore.vala
+++ b/src/engine/nonblocking/nonblocking-counting-semaphore.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-error.vala b/src/engine/nonblocking/nonblocking-error.vala
index 8972baa..f852a7a 100644
--- a/src/engine/nonblocking/nonblocking-error.vala
+++ b/src/engine/nonblocking/nonblocking-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-mailbox.vala b/src/engine/nonblocking/nonblocking-mailbox.vala
index 9548af5..5cd97a0 100644
--- a/src/engine/nonblocking/nonblocking-mailbox.vala
+++ b/src/engine/nonblocking/nonblocking-mailbox.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-mutex.vala b/src/engine/nonblocking/nonblocking-mutex.vala
index e501e3b..1af8626 100644
--- a/src/engine/nonblocking/nonblocking-mutex.vala
+++ b/src/engine/nonblocking/nonblocking-mutex.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-reporting-semaphore.vala 
b/src/engine/nonblocking/nonblocking-reporting-semaphore.vala
index 9a60a8b..744bf1c 100644
--- a/src/engine/nonblocking/nonblocking-reporting-semaphore.vala
+++ b/src/engine/nonblocking/nonblocking-reporting-semaphore.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/nonblocking/nonblocking-variants.vala 
b/src/engine/nonblocking/nonblocking-variants.vala
index b2f576d..b774a6f 100644
--- a/src/engine/nonblocking/nonblocking-variants.vala
+++ b/src/engine/nonblocking/nonblocking-variants.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-error.vala b/src/engine/rfc822/rfc822-error.vala
index dd39b6b..23105ca 100644
--- a/src/engine/rfc822/rfc822-error.vala
+++ b/src/engine/rfc822/rfc822-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala 
b/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
index bbce37a..95dd557 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-blockquotes.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
 *
 * This software is licensed under the GNU Lesser General Public License
 * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-gmime-filter-flowed.vala 
b/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
index 2614fd7..248cf90 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-flowed.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
 *
 * This software is licensed under the GNU Lesser General Public License
 * (version 2.1 or later).  See the COPYING file in this distribution. 
diff --git a/src/engine/rfc822/rfc822-gmime-filter-plain.vala 
b/src/engine/rfc822/rfc822-gmime-filter-plain.vala
index 2f7f906..a018b00 100644
--- a/src/engine/rfc822/rfc822-gmime-filter-plain.vala
+++ b/src/engine/rfc822/rfc822-gmime-filter-plain.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
 *
 * This software is licensed under the GNU Lesser General Public License
 * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-mailbox-address.vala b/src/engine/rfc822/rfc822-mailbox-address.vala
index 20cb457..c2c904f 100644
--- a/src/engine/rfc822/rfc822-mailbox-address.vala
+++ b/src/engine/rfc822/rfc822-mailbox-address.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-mailbox-addresses.vala b/src/engine/rfc822/rfc822-mailbox-addresses.vala
index 2c60aca..b5f39b1 100644
--- a/src/engine/rfc822/rfc822-mailbox-addresses.vala
+++ b/src/engine/rfc822/rfc822-mailbox-addresses.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-message-data.vala b/src/engine/rfc822/rfc822-message-data.vala
index 09a78d1..658a397 100644
--- a/src/engine/rfc822/rfc822-message-data.vala
+++ b/src/engine/rfc822/rfc822-message-data.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-message.vala b/src/engine/rfc822/rfc822-message.vala
index e389348..58491c0 100644
--- a/src/engine/rfc822/rfc822-message.vala
+++ b/src/engine/rfc822/rfc822-message.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/rfc822/rfc822-utils.vala b/src/engine/rfc822/rfc822-utils.vala
index 99bf3cb..0b3347a 100644
--- a/src/engine/rfc822/rfc822-utils.vala
+++ b/src/engine/rfc822/rfc822-utils.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  * Portions copyright (C) 2000-2013 Jeffrey Stedfast
  *
  * This software is licensed under the GNU Lesser General Public License
diff --git a/src/engine/rfc822/rfc822.vala b/src/engine/rfc822/rfc822.vala
index 405ec3d..f625671 100644
--- a/src/engine/rfc822/rfc822.vala
+++ b/src/engine/rfc822/rfc822.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-authenticator.vala b/src/engine/smtp/smtp-authenticator.vala
index 99b09f2..76dbee0 100644
--- a/src/engine/smtp/smtp-authenticator.vala
+++ b/src/engine/smtp/smtp-authenticator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-capabilities.vala b/src/engine/smtp/smtp-capabilities.vala
index a9c091a..b6f8573 100644
--- a/src/engine/smtp/smtp-capabilities.vala
+++ b/src/engine/smtp/smtp-capabilities.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-client-connection.vala b/src/engine/smtp/smtp-client-connection.vala
index 4792240..047994a 100644
--- a/src/engine/smtp/smtp-client-connection.vala
+++ b/src/engine/smtp/smtp-client-connection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-client-session.vala b/src/engine/smtp/smtp-client-session.vala
index 1307bac..ac67386 100644
--- a/src/engine/smtp/smtp-client-session.vala
+++ b/src/engine/smtp/smtp-client-session.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-command.vala b/src/engine/smtp/smtp-command.vala
index e29ab1a..47db764 100644
--- a/src/engine/smtp/smtp-command.vala
+++ b/src/engine/smtp/smtp-command.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-data-format.vala b/src/engine/smtp/smtp-data-format.vala
index 3fc4885..fcceb76 100644
--- a/src/engine/smtp/smtp-data-format.vala
+++ b/src/engine/smtp/smtp-data-format.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-error.vala b/src/engine/smtp/smtp-error.vala
index 6109687..97f34f2 100644
--- a/src/engine/smtp/smtp-error.vala
+++ b/src/engine/smtp/smtp-error.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-greeting.vala b/src/engine/smtp/smtp-greeting.vala
index 28d11a8..676ef25 100644
--- a/src/engine/smtp/smtp-greeting.vala
+++ b/src/engine/smtp/smtp-greeting.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-login-authenticator.vala b/src/engine/smtp/smtp-login-authenticator.vala
index b0ddfe3..12c2319 100644
--- a/src/engine/smtp/smtp-login-authenticator.vala
+++ b/src/engine/smtp/smtp-login-authenticator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-plain-authenticator.vala b/src/engine/smtp/smtp-plain-authenticator.vala
index 9031a38..59efd83 100644
--- a/src/engine/smtp/smtp-plain-authenticator.vala
+++ b/src/engine/smtp/smtp-plain-authenticator.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-request.vala b/src/engine/smtp/smtp-request.vala
index 3659e27..38aa70a 100644
--- a/src/engine/smtp/smtp-request.vala
+++ b/src/engine/smtp/smtp-request.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-response-code.vala b/src/engine/smtp/smtp-response-code.vala
index 0e6e863..9a4fd6a 100644
--- a/src/engine/smtp/smtp-response-code.vala
+++ b/src/engine/smtp/smtp-response-code.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-response-line.vala b/src/engine/smtp/smtp-response-line.vala
index 6414435..468c3e0 100644
--- a/src/engine/smtp/smtp-response-line.vala
+++ b/src/engine/smtp/smtp-response-line.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/smtp/smtp-response.vala b/src/engine/smtp/smtp-response.vala
index 52f8358..717c0f3 100644
--- a/src/engine/smtp/smtp-response.vala
+++ b/src/engine/smtp/smtp-response.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/state/state-machine-descriptor.vala b/src/engine/state/state-machine-descriptor.vala
index dfc175d..940e9f1 100644
--- a/src/engine/state/state-machine-descriptor.vala
+++ b/src/engine/state/state-machine-descriptor.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/state/state-machine.vala b/src/engine/state/state-machine.vala
index 6b4376a..b88a4d0 100644
--- a/src/engine/state/state-machine.vala
+++ b/src/engine/state/state-machine.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/state/state-mapping.vala b/src/engine/state/state-mapping.vala
index 132ee90..f4b2ce7 100644
--- a/src/engine/state/state-mapping.vala
+++ b/src/engine/state/state-mapping.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-ascii.vala b/src/engine/util/util-ascii.vala
index e128762..4d915f6 100644
--- a/src/engine/util/util-ascii.vala
+++ b/src/engine/util/util-ascii.vala
@@ -1,4 +1,4 @@
-/* Copyright 2014-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-collection.vala b/src/engine/util/util-collection.vala
index 6b81870..6859569 100644
--- a/src/engine/util/util-collection.vala
+++ b/src/engine/util/util-collection.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-converter.vala b/src/engine/util/util-converter.vala
index f3c1e57..74cc0bc 100644
--- a/src/engine/util/util-converter.vala
+++ b/src/engine/util/util-converter.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-files.vala b/src/engine/util/util-files.vala
index 6d743ff..5f0827e 100644
--- a/src/engine/util/util-files.vala
+++ b/src/engine/util/util-files.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-generic-capabilities.vala b/src/engine/util/util-generic-capabilities.vala
index 297e84b..77d4984 100644
--- a/src/engine/util/util-generic-capabilities.vala
+++ b/src/engine/util/util-generic-capabilities.vala
@@ -1,4 +1,4 @@
-/* Copyright 2012-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-html.vala b/src/engine/util/util-html.vala
index 1c5a997..051d034 100644
--- a/src/engine/util/util-html.vala
+++ b/src/engine/util/util-html.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-imap-utf7.vala b/src/engine/util/util-imap-utf7.vala
index f87e80a..ccd1078 100644
--- a/src/engine/util/util-imap-utf7.vala
+++ b/src/engine/util/util-imap-utf7.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  * Copyright (c) 2008-2012 Dovecot authors
  *
  * This software is licensed under the GNU Lesser General Public License
diff --git a/src/engine/util/util-inet.vala b/src/engine/util/util-inet.vala
index 591f614..a8437f4 100644
--- a/src/engine/util/util-inet.vala
+++ b/src/engine/util/util-inet.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-iterable.vala b/src/engine/util/util-iterable.vala
index bad4f63..929af73 100644
--- a/src/engine/util/util-iterable.vala
+++ b/src/engine/util/util-iterable.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-numeric.vala b/src/engine/util/util-numeric.vala
index 8f1ea1a..4c1ac9d 100644
--- a/src/engine/util/util-numeric.vala
+++ b/src/engine/util/util-numeric.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-object.vala b/src/engine/util/util-object.vala
index 6e776de..b124d9e 100644
--- a/src/engine/util/util-object.vala
+++ b/src/engine/util/util-object.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-reference-semantics.vala b/src/engine/util/util-reference-semantics.vala
index 9d59bbf..56b3ed9 100644
--- a/src/engine/util/util-reference-semantics.vala
+++ b/src/engine/util/util-reference-semantics.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-scheduler.vala b/src/engine/util/util-scheduler.vala
index 6a5e680..a50ad8d 100644
--- a/src/engine/util/util-scheduler.vala
+++ b/src/engine/util/util-scheduler.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-stream.vala b/src/engine/util/util-stream.vala
index 4122ae9..ba90c3f 100644
--- a/src/engine/util/util-stream.vala
+++ b/src/engine/util/util-stream.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-string.vala b/src/engine/util/util-string.vala
index 3c09bac..924ade9 100644
--- a/src/engine/util/util-string.vala
+++ b/src/engine/util/util-string.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-synchronization.vala b/src/engine/util/util-synchronization.vala
index 584a020..f4db10b 100644
--- a/src/engine/util/util-synchronization.vala
+++ b/src/engine/util/util-synchronization.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-time.vala b/src/engine/util/util-time.vala
index 732ca36..cc9b6bd 100644
--- a/src/engine/util/util-time.vala
+++ b/src/engine/util/util-time.vala
@@ -1,4 +1,4 @@
-/* Copyright 2013-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/engine/util/util-trillian.vala b/src/engine/util/util-trillian.vala
index edfc853..320ec5a 100644
--- a/src/engine/util/util-trillian.vala
+++ b/src/engine/util/util-trillian.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.
diff --git a/src/mailer/main.vala b/src/mailer/main.vala
index faa2d4b..b3b5e56 100644
--- a/src/mailer/main.vala
+++ b/src/mailer/main.vala
@@ -1,4 +1,4 @@
-/* Copyright 2011-2015 Yorba Foundation
+/* Copyright 2016 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later).  See the COPYING file in this distribution.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]