diff --git a/src/Monolog/Handler/PushoverHandler.php b/src/Monolog/Handler/PushoverHandler.php
index 42b3c20f..c5115f46 100644
--- a/src/Monolog/Handler/PushoverHandler.php
+++ b/src/Monolog/Handler/PushoverHandler.php
@@ -43,11 +43,12 @@ class PushoverHandler extends SocketHandler
 
     protected function generateDataStream($record)
     {
-        $content = $this->buildContentString($record);
-        return $this->buildHeaderAndAddContent($content);
+        $content = $this->buildContent($record);
+
+        return $this->buildHeader($content) . $content;
     }
 
-    private function buildContentString($record)
+    private function buildContent($record)
     {
         // Pushover has a limit of 512 characters on title and message combined.
         $maxMessageLength = 512 - strlen($this->title);
@@ -65,15 +66,14 @@ class PushoverHandler extends SocketHandler
         return http_build_query($dataArray);
     }
 
-    private function buildHeaderAndAddContent($content)
+    private function buildHeader($content)
     {
         $header = "POST /1/messages.json HTTP/1.1\r\n";
         $header .= "Host: api.pushover.net\r\n";
         $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
         $header .= "Content-Length: " . strlen($content) . "\r\n";
         $header .= "\r\n";
-        $header .= $content;
 
         return $header;
     }
-}
\ No newline at end of file
+}
diff --git a/tests/Monolog/Handler/PushoverHandlerTest.php b/tests/Monolog/Handler/PushoverHandlerTest.php
index 878f4f68..5c618a2e 100644
--- a/tests/Monolog/Handler/PushoverHandlerTest.php
+++ b/tests/Monolog/Handler/PushoverHandlerTest.php
@@ -79,15 +79,14 @@ class PushoverHandlerTest extends TestCase
         $this->assertRegexp('/message=' . $expectedMessage . '&title/', $content);
     }
 
-    private function createHandler($token = 'myToken', $user = 'myUser', $title = null)
+    private function createHandler($token = 'myToken', $user = 'myUser', $title = 'Monolog')
     {
-        $constructArray = array($token, $user);
-        if($title != null) {
-            $constructArray[2] = $title;
-        }
+        $constructorArgs = array($token, $user, $title);
         $this->res = fopen('php://memory', 'a');
         $this->handler = $this->getMock(
-            '\Monolog\Handler\PushoverHandler', array('fsockopen', 'streamSetTimeout'), $constructArray
+            '\Monolog\Handler\PushoverHandler',
+            array('fsockopen', 'streamSetTimeout'),
+            $constructorArgs
         );
 
         $reflectionProperty = new \ReflectionProperty('\Monolog\Handler\SocketHandler', 'connectionString');
@@ -103,5 +102,4 @@ class PushoverHandlerTest extends TestCase
 
         $this->handler->setFormatter($this->getIdentityFormatter());
     }
-
-}
\ No newline at end of file
+}