diff --git a/akka-actor/src/main/scala/akka/actor/Actor.scala b/akka-actor/src/main/scala/akka/actor/Actor.scala
index 264fc7b791..d2d5b5577c 100644
--- a/akka-actor/src/main/scala/akka/actor/Actor.scala
+++ b/akka-actor/src/main/scala/akka/actor/Actor.scala
@@ -266,7 +266,6 @@ trait Actor {
    * The reference sender Actor of the last received message.
    * Is defined if the message was sent from another Actor, else None.
    */
-  @inline
   final def sender: ActorRef = context.sender
 
   /**
diff --git a/akka-actor/src/main/scala/akka/actor/ActorCell.scala b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
index 9fb2c4737b..c74aa18e9b 100644
--- a/akka-actor/src/main/scala/akka/actor/ActorCell.scala
+++ b/akka-actor/src/main/scala/akka/actor/ActorCell.scala
@@ -85,10 +85,12 @@ private[akka] class ActorCell(
 
   final def provider = system.provider
 
-  def receiveTimeout: Option[Long] = if (receiveTimeoutData._1 > 0) Some(receiveTimeoutData._1) else None
+  override def receiveTimeout: Option[Long] = if (receiveTimeoutData._1 > 0) Some(receiveTimeoutData._1) else None
 
-  def receiveTimeout_=(timeout: Option[Long]): Unit =
-    receiveTimeoutData = (if (timeout.isEmpty || timeout.get < 1) -1 else timeout.get, receiveTimeoutData._2)
+  override def receiveTimeout_=(timeout: Option[Long]): Unit = {
+    val timeoutMs = if (timeout.isDefined && timeout.get > 0) timeout.get else -1
+    receiveTimeoutData = (timeoutMs, receiveTimeoutData._2)
+  }
 
   var receiveTimeoutData: (Long, Cancellable) =
     if (_receiveTimeout.isDefined) (_receiveTimeout.get, emptyCancellable) else emptyReceiveTimeoutData