diff --git a/.travis.yml b/.travis.yml
index fb7ec6d0..900cd401 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,7 @@ php:
     - 5.4
     - 5.5
     - 5.6
+    - 7.0
     - hhvm
 
 matrix:
diff --git a/composer.json b/composer.json
index 481c15b1..c9bea01d 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,16 @@
 {
 	"name": "nette/mail",
 	"description": "Nette Mail: Sending E-mails",
-	"homepage": "http://nette.org",
+	"homepage": "https://nette.org",
 	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
 	"authors": [
 		{
 			"name": "David Grudl",
-			"homepage": "http://davidgrudl.com"
+			"homepage": "https://davidgrudl.com"
 		},
 		{
 			"name": "Nette Community",
-			"homepage": "http://nette.org/contributors"
+			"homepage": "https://nette.org/contributors"
 		}
 	],
 	"require": {
diff --git a/contributing.md b/contributing.md
index a1cbbd53..860882bf 100644
--- a/contributing.md
+++ b/contributing.md
@@ -5,7 +5,7 @@ The issue tracker is the preferred channel for bug reports, features requests
 and submitting pull requests, but please respect the following restrictions:
 
 * Please **do not** use the issue tracker for personal support requests (use
-  [Nette forum](http://forum.nette.org) or [Stack Overflow](http://stackoverflow.com)).
+  [Nette forum](https://forum.nette.org) or [Stack Overflow](http://stackoverflow.com)).
 
 * Please **do not** derail or troll issues. Keep the discussion on topic and
   respect the opinions of others.
@@ -21,7 +21,7 @@ fits with the scope and aims of the project. It's up to *you* to make a strong
 case to convince the project's developers of the merits of this feature.
 
 Nette welcomes **pull requests**. If you'd like to contribute, please take a moment
-to [read the guidelines](http://nette.org/en/contributing) in order to make
+to [read the guidelines](https://nette.org/en/contributing) in order to make
 the contribution process easy and effective for everyone involved.
 
 Thanks!
diff --git a/license.md b/license.md
index af571d59..cf741bd0 100644
--- a/license.md
+++ b/license.md
@@ -21,7 +21,7 @@ If your stuff is good, it will not take long to establish a reputation for yours
 New BSD License
 ---------------
 
-Copyright (c) 2004, 2014 David Grudl (http://davidgrudl.com)
+Copyright (c) 2004, 2014 David Grudl (https://davidgrudl.com)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/src/Mail/IMailer.php b/src/Mail/IMailer.php
index 14f14f16..a5a481f6 100644
--- a/src/Mail/IMailer.php
+++ b/src/Mail/IMailer.php
@@ -1,14 +1,12 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Mail;
 
-use Nette;
-
 
 /**
  * Mailer interface.
diff --git a/src/Mail/Message.php b/src/Mail/Message.php
index 43bc5838..8a0ce71a 100644
--- a/src/Mail/Message.php
+++ b/src/Mail/Message.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Mail;
@@ -16,10 +16,7 @@
  *
  * @author     David Grudl
  *
- * @property   array $from
  * @property   string $subject
- * @property   string $returnPath
- * @property   int $priority
  * @property   mixed $htmlBody
  */
 class Message extends MimePart
diff --git a/src/Mail/MimePart.php b/src/Mail/MimePart.php
index 91b8e8f9..c9cd9415 100644
--- a/src/Mail/MimePart.php
+++ b/src/Mail/MimePart.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Mail;
@@ -16,9 +16,6 @@
  *
  * @author     David Grudl
  *
- * @property-read array $headers
- * @property-write $contentType
- * @property   string $encoding
  * @property   mixed $body
  */
 class MimePart extends Nette\Object
diff --git a/src/Mail/SendmailMailer.php b/src/Mail/SendmailMailer.php
index 763abe88..6899b5d7 100644
--- a/src/Mail/SendmailMailer.php
+++ b/src/Mail/SendmailMailer.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Mail;
diff --git a/src/Mail/SmtpMailer.php b/src/Mail/SmtpMailer.php
index 22ddd5ee..4d3779b2 100644
--- a/src/Mail/SmtpMailer.php
+++ b/src/Mail/SmtpMailer.php
@@ -1,8 +1,8 @@
 <?php
 
 /**
- * This file is part of the Nette Framework (http://nette.org)
- * Copyright (c) 2004 David Grudl (http://davidgrudl.com)
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
  */
 
 namespace Nette\Mail;
@@ -159,7 +159,7 @@ protected function disconnect()
 
 
 	/**
-	 * Writes data to server and checks response.
+	 * Writes data to server and checks response against expected code if some provided.
 	 * @param  string
 	 * @param  int   response code
 	 * @param  string  error message
@@ -168,8 +168,11 @@ protected function disconnect()
 	protected function write($line, $expectedCode = NULL, $message = NULL)
 	{
 		fwrite($this->connection, $line . Message::EOL);
-		if ($expectedCode && !in_array((int) $this->read(), (array) $expectedCode, TRUE)) {
-			throw new SmtpException('SMTP server did not accept ' . ($message ? $message : $line));
+		if ($expectedCode) {
+			$response = $this->read();
+			if (!in_array((int) $response, (array) $expectedCode, TRUE)) {
+				throw new SmtpException('SMTP server did not accept ' . ($message ? $message : $line) . ' with error: ' . trim($response));
+			}
 		}
 	}
 
diff --git a/tests/Mail/Mail.HtmlBody.phpt b/tests/Mail/Mail.HtmlBody.phpt
index fd6451a4..b8e60054 100644
--- a/tests/Mail/Mail.HtmlBody.phpt
+++ b/tests/Mail/Mail.HtmlBody.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.attachment.phpt b/tests/Mail/Mail.attachment.phpt
index 81286e40..5ca3c4f1 100644
--- a/tests/Mail/Mail.attachment.phpt
+++ b/tests/Mail/Mail.attachment.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mailer = new TestMailer();
diff --git a/tests/Mail/Mail.email.long.phpt b/tests/Mail/Mail.email.long.phpt
index eff9c74b..e0749f41 100644
--- a/tests/Mail/Mail.email.long.phpt
+++ b/tests/Mail/Mail.email.long.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.email.multiple.phpt b/tests/Mail/Mail.email.multiple.phpt
index 6b96be7b..aa3df3aa 100644
--- a/tests/Mail/Mail.email.multiple.phpt
+++ b/tests/Mail/Mail.email.multiple.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.email.phpt b/tests/Mail/Mail.email.phpt
index a8216bb0..59c53c6a 100644
--- a/tests/Mail/Mail.email.phpt
+++ b/tests/Mail/Mail.email.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.headers.001.phpt b/tests/Mail/Mail.headers.001.phpt
index bd33563b..5d151043 100644
--- a/tests/Mail/Mail.headers.001.phpt
+++ b/tests/Mail/Mail.headers.001.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.headers.002.phpt b/tests/Mail/Mail.headers.002.phpt
index fbf5c1a2..0c7285ad 100644
--- a/tests/Mail/Mail.headers.002.phpt
+++ b/tests/Mail/Mail.headers.002.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.longLines.phpt b/tests/Mail/Mail.longLines.phpt
index f29d4d39..8e63500f 100644
--- a/tests/Mail/Mail.longLines.phpt
+++ b/tests/Mail/Mail.longLines.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.inc b/tests/Mail/Mail.php
similarity index 100%
rename from tests/Mail/Mail.inc
rename to tests/Mail/Mail.php
diff --git a/tests/Mail/Mail.subject.phpt b/tests/Mail/Mail.subject.phpt
index b9f2dffb..3b5d9348 100644
--- a/tests/Mail/Mail.subject.phpt
+++ b/tests/Mail/Mail.subject.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mailer = new TestMailer();
diff --git a/tests/Mail/Mail.textualAndHtmlBody.attachment.phpt b/tests/Mail/Mail.textualAndHtmlBody.attachment.phpt
index a7eba72e..24e235b1 100644
--- a/tests/Mail/Mail.textualAndHtmlBody.attachment.phpt
+++ b/tests/Mail/Mail.textualAndHtmlBody.attachment.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.textualAndHtmlBody.embedded.attachment.phpt b/tests/Mail/Mail.textualAndHtmlBody.embedded.attachment.phpt
index eab64bf6..b1c607d3 100644
--- a/tests/Mail/Mail.textualAndHtmlBody.embedded.attachment.phpt
+++ b/tests/Mail/Mail.textualAndHtmlBody.embedded.attachment.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.textualAndHtmlBody.embedded.phpt b/tests/Mail/Mail.textualAndHtmlBody.embedded.phpt
index c5a6cce9..dd80ed33 100644
--- a/tests/Mail/Mail.textualAndHtmlBody.embedded.phpt
+++ b/tests/Mail/Mail.textualAndHtmlBody.embedded.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.textualAndHtmlBody.phpt b/tests/Mail/Mail.textualAndHtmlBody.phpt
index 9c6b032f..1502ff33 100644
--- a/tests/Mail/Mail.textualAndHtmlBody.phpt
+++ b/tests/Mail/Mail.textualAndHtmlBody.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.textualBody.attachment.phpt b/tests/Mail/Mail.textualBody.attachment.phpt
index 2f35d0e9..f17c3406 100644
--- a/tests/Mail/Mail.textualBody.attachment.phpt
+++ b/tests/Mail/Mail.textualBody.attachment.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();
diff --git a/tests/Mail/Mail.textualBody.phpt b/tests/Mail/Mail.textualBody.phpt
index 337efb93..2716b999 100644
--- a/tests/Mail/Mail.textualBody.phpt
+++ b/tests/Mail/Mail.textualBody.phpt
@@ -10,7 +10,7 @@ use Tester\Assert;
 
 require __DIR__ . '/../bootstrap.php';
 
-require __DIR__ . '/Mail.inc';
+require __DIR__ . '/Mail.php';
 
 
 $mail = new Message();